Merge remote-tracking branch 'origin/master'

master
Yangwl 1 year ago
commit 5b0fb2d333

@ -11,6 +11,87 @@ public class BoardDTO {
private String equTypeCode;
private String equTypeName;
private String shiftId;
private String factoryCode;
private String equipmentTypeCode;
private String planProduction;
private String actProduction;
private List<String> plans;
private List<String> acts;
private List<String> days;
private String startTime;
private String endTime;
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public List<String> getDays() {
return days;
}
public void setDays(List<String> days) {
this.days = days;
}
public String getPlanProduction() {
return planProduction;
}
public void setPlanProduction(String planProduction) {
this.planProduction = planProduction;
}
public String getActProduction() {
return actProduction;
}
public void setActProduction(String actProduction) {
this.actProduction = actProduction;
}
public List<String> getPlans() {
return plans;
}
public void setPlans(List<String> plans) {
this.plans = plans;
}
public List<String> getActs() {
return acts;
}
public void setActs(List<String> acts) {
this.acts = acts;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getShiftId() {
return shiftId;

@ -1,19 +1,21 @@
package com.op.mes.controller;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.mes.domain.MesBoard;
import com.op.mes.service.IMesBoradService;
import com.op.system.api.domain.dto.BoardDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/mesborad")
public class MesBoardController {
public class MesBoardController extends BaseController {
@Autowired
private IMesBoradService iMesBoradService;
@ -25,5 +27,21 @@ public class MesBoardController {
public AjaxResult finishProductBoard(@RequestBody BoardDTO boardDTO) {
return iMesBoradService.finishProductBoard(boardDTO);
}
/******************************自动化产线方案看板****************************************/
/**根据工厂获取产线**/
@GetMapping("/getLineList")
public List<BoardDTO> getLineList(BoardDTO mesBoard) {
return iMesBoradService.getLineList(mesBoard);
}
@PostMapping("/getProduction15Days")
public AjaxResult getProduction15Days(BoardDTO mesBoard) {
if (StringUtils.isBlank(mesBoard.getFactoryCode())) {
return error("[facotryCode] 不能为空");
}
if (StringUtils.isBlank(mesBoard.getEquCode())) {
return error("[equCode] 不能为空");
}
return success(iMesBoradService.getProduction15Days(mesBoard));
}
}

@ -19,6 +19,24 @@ public class MesBoard {
private List<BaseFileData> files;
private String workshopCode;
private String workshopName;
private String lineCode;
private String lineName;
public String getLineCode() {
return lineCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
public String getLineName() {
return lineName;
}
public void setLineName(String lineName) {
this.lineName = lineName;
}
public String getWorkshopCode() {
return workshopCode;

@ -2,6 +2,7 @@ package com.op.mes.mapper;
import com.op.common.core.domain.BaseFileData;
import com.op.mes.domain.MesBoard;
import com.op.mes.domain.MesReportWork;
import com.op.mes.domain.dto.BaseEquipmentDto;
import com.op.mes.domain.dto.LGInfoDto;
import com.op.system.api.domain.SysDept;
@ -9,6 +10,7 @@ import com.op.system.api.domain.SysSapLog;
import com.op.system.api.domain.dto.BoardDTO;
import com.op.system.api.domain.dto.WCSDTO;
import com.op.system.api.domain.dto.WCSDataItemsDTO;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -72,4 +74,9 @@ public interface MesMapper {
List<Map<String, String>> daySenvenProduction();
List<Map<String, String>> ProductionInProgress();
List<BoardDTO> getLineList(BoardDTO boardDTO);
@MapKey("dayStr")
Map<String, MesReportWork> getProduction15Days(BoardDTO boardDTO);
}

@ -3,6 +3,12 @@ package com.op.mes.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.system.api.domain.dto.BoardDTO;
import java.util.List;
public interface IMesBoradService {
public AjaxResult finishProductBoard(BoardDTO boardDTO);
public List<BoardDTO> getLineList(BoardDTO boardDTO);
public BoardDTO getProduction15Days(BoardDTO mesBoard);
}

@ -1,17 +1,19 @@
package com.op.mes.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.mes.domain.MesReportWork;
import com.op.mes.mapper.MesMapper;
import com.op.mes.service.IMesBoradService;
import com.op.system.api.domain.dto.BoardDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
public class MesBoradServiceImpl implements IMesBoradService {
@ -34,4 +36,86 @@ public class MesBoradServiceImpl implements IMesBoradService {
map.put("ProductionInProgress", ProductionInProgress);
return AjaxResult.success(map);
}
@Override
public List<BoardDTO> getLineList(BoardDTO boardDTO) {
DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
boardDTO.setEquipmentTypeCode("equ_type_bzx");
List<BoardDTO> lineList = mesMapper.getLineList(boardDTO);
return lineList;
}
@Override
public BoardDTO getProduction15Days(BoardDTO boardDTO) {
DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
BoardDTO dto = new BoardDTO();
String nowDate = DateUtils.getDate();
List<String> days = this.getDays(15);
//days
dto.setDays(days);
boardDTO.setStartTime(days.get(0));
boardDTO.setEndTime(days.get(days.size()-1));
Map<String,MesReportWork> pros15 = mesMapper.getProduction15Days(boardDTO);
MesReportWork todaydto = pros15.get(nowDate);
if(todaydto != null){
dto.setPlanProduction(todaydto.getQuantity().toString().replace(".00",""));
dto.setActProduction(todaydto.getQuantityFeedback().toString());
}else{
dto.setPlanProduction("0");
dto.setActProduction("0");
}
//plans;
List<String> plans = new ArrayList<>();
List<String> acts = new ArrayList<>();
//acts;
for(String dayStr:days){
MesReportWork workR = pros15.get(dayStr);
if(workR != null){
plans.add(workR.getQuantity().toString());
acts.add(workR.getQuantityFeedback().toString());
}else{
plans.add("0");
acts.add("0");
}
}
dto.setPlans(plans);
dto.setActs(acts);
return dto;
}
//获取当前日期前几天
private List<String> getDays(int dayNum){
List<String> days = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar cal = Calendar.getInstance();
//获取前面的时间用-负号
Date date = new Date();
for(int num=0;num<dayNum;num++){
cal.setTime(date);
cal.add(Calendar.DAY_OF_MONTH, -num);
days.add(sdf.format(cal.getTime()));
}
Collections.reverse(days);
return days;
}
public static void main(String[] args){
List<String> days = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar cal = Calendar.getInstance();
//获取前面的时间用-负号
Date date = new Date();
for(int num=0;num<15;num++){
cal.setTime(date);
cal.add(Calendar.DAY_OF_MONTH, -num);
days.add(sdf.format(cal.getTime()));
}
Collections.reverse(days);
System.out.println(JSONObject.toJSONString(days));
}
}

@ -286,4 +286,23 @@
A.unit,
C.equipment_name;
</select>
<select id="getLineList" resultType="com.op.system.api.domain.dto.BoardDTO">
select equipment_code equCode,
equipment_name equName
from base_equipment
where equipment_type_code = #{equipmentTypeCode}
and status = '1' and del_flag='0'
</select>
<select id="getProduction15Days" resultType="com.op.mes.domain.MesReportWork">
select sum(mrw.quantity_feedback) quantityFeedback,
pow.product_date productDate,
pow.quantity_split quantity
from mes_report_work mrw
left join pro_order_workorder pow on pow.workorder_code = mrw.workorder_code
where mrw.del_flag='0' and pow.del_flag='0' and mrw.parent_order = '0'
and pow.workorder_name = #{equCode}
and CONVERT(DATE, pow.product_date) BETWEEN DATEADD(DAY, -15, CONVERT(DATE, GETDATE())) AND CONVERT(DATE, GETDATE())
group by pow.product_date,pow.quantity_split
</select>
</mapper>

@ -52,7 +52,6 @@
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
<if test="recoil != null and recoil != ''">and recoil = #{recoil}</if>
and del_flag = '0'
and quantity != '.00'
</where>
</select>
@ -94,7 +93,7 @@
)
</if>
<if test='productType == "bcp"'>
and bp.product_code like '00000004%'
and bp.product_code not like '00000001%'
</if>
</select>
<select id="getTeamList" resultType="com.op.system.api.domain.mes.BaseTeamTDTO">

@ -379,7 +379,7 @@ public class OpenServiceImpl implements OpenService {
QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
if (group == null) {
group = new QcMaterialGroupDetailDTO();
group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");
group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组
}
qctp.setGroupId(group.getGroupId());//共性
List<QcCheckTaskDetailDTO> itemsGG = openMapper.getTPByTypeGroup(qctp);

@ -4,10 +4,7 @@ import java.util.Date;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.plan.domain.BMS;
import com.op.plan.domain.Bucket;
import com.op.plan.domain.ProWetMaterialPlan;
import com.op.plan.domain.Product;
import com.op.plan.domain.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -138,4 +135,8 @@ public interface ProWetMaterialPlanMapper {
* @return
*/
ProWetMaterialPlan selectProWetMaterialPlanByWorkIdN(String workorderId);
void deletePrepare(@Param("works") List<ProOrderWorkorder> works);
void deletePrepareBatch(@Param("works") List<ProOrderWorkorder> workers);
}

@ -269,6 +269,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds0);
//删除批次pro_order_workorder_batch
proOrderWorkorderBatchMapper.deleteBatch(workorderIds0);
// //删除mes_prepare
// proWetMaterialPlanMapper.deletePrepare(workers);
// //删除mes_prepare_detail
// proWetMaterialPlanMapper.deletePrepareBatch(workers);
}
if (!CollectionUtils.isEmpty(workers)) {

@ -204,4 +204,23 @@
#{id}
</foreach>
</delete>
<delete id="deletePrepare">
update mes_prepare
set del_flag = '1'
where workorder_code in
<foreach item="work" collection="works" open="(" separator="," close=")">
#{workorderCode}
</foreach>
</delete>
<delete id="deletePrepareBatch">
update mes_prepare_detail
set del_flag = '1'
where prepare_id in(
select prepare_id from mes_prepare
where workorder_code in
<foreach item="work" collection="works" open="(" separator="," close=")">
#{workorderCode}
</foreach>
)
</delete>
</mapper>

@ -1,5 +1,6 @@
package com.op.quality.controller;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.StringUtils;
import com.op.quality.domain.QcCheckType;
import com.op.quality.domain.QcInterface;

@ -52,6 +52,15 @@ public class QcInterface extends BaseEntity {
private String nameDate;
private List<String> dataBarArrays;
private List<String> dataLineArrays;
private String equipmentTypeCode;
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public List<String> getDataBarArrays() {
return dataBarArrays;

@ -37,4 +37,5 @@ public interface IQcInterfaceService {
List<QcInterface> getMonthOfYearContrast(QcInterface qcInterface);
QcLineChartDto getLineQcData(QcInterface qcInterface);
}

@ -273,7 +273,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
/**qc_check_task**/
int n = qcCheckReportIncomeMapper.submitConfirm(qcCheckReportIncome);
logger.info("qc_check_task【二次确认】" + qcCheckReportIncome.getCheckType() + ":" + n);
return n;
return 1;
}
return 0;
}

@ -240,7 +240,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}
@ -667,8 +667,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
}
}
}
n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
logger.info("qc_check_task_defect:"+n);
if(!CollectionUtils.isEmpty(defects)){
n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
logger.info("qc_check_task_defect:"+n);
}
if("material".equals(qcCheckTaskIncome.getTypeCode())){
qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2");
@ -720,7 +722,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
logger.info("qc_check_unqualified:" + n);
}
return n ;
return 1 ;
}
@Override

@ -183,7 +183,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality());
}
}

@ -181,7 +181,7 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService {
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality());
}
}

@ -226,7 +226,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}

@ -205,7 +205,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}

@ -132,7 +132,7 @@
</select>
<select id="getDefectMap" resultType="com.op.quality.domain.QcCheckTaskDefect">
SELECT
belong_to,
belong_to belongTo,
belong_to_detail belongToDetail,
STUFF(
(SELECT ',' + defect_code
@ -140,22 +140,23 @@
WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to
FOR xml path('')
),1,1,''
) defectCodes,
STUFF(
(SELECT ',' + defect_subclass+':' + CAST(noOk_quality AS VARCHAR(15))
FROM qc_check_task_defect
WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to
FOR xml path('')
),1,1,''
) defectNames,
STUFF(
(SELECT ',' + CAST(noOk_quality AS VARCHAR(15))
FROM qc_check_task_defect
WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to
FOR xml path('')
),1,1,''
) defectQualitys
) defectCodes,
STUFF(
(SELECT ',' + defect_subclass+':' + CAST(noOk_quality AS VARCHAR(15))
FROM qc_check_task_defect
WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to
FOR xml path('')
),1,1,''
) defectNames,
STUFF(
(SELECT ',' + CAST(noOk_quality AS VARCHAR(15))
FROM qc_check_task_defect
WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to
FOR xml path('')
),1,1,''
) defectQualitys
FROM qc_check_task_defect qctd where qctd.del_flag = '0' and belong_to= #{belongTo}
and belong_to_detail is not null
GROUP by qctd.belong_to,qctd.belong_to_detail
</select>

@ -95,9 +95,7 @@ public class BaseEquipmentController extends BaseController {
public AjaxResult add(@RequestBody BaseEquipment baseEquipment) {
if (baseEquipmentService.checkEquipmentCodeUnique(baseEquipment)) {
return AjaxResult.error("设备编码已存在!");
} else if (baseEquipmentService.checkEquipmentNameUnique(baseEquipment)) {
return AjaxResult.error("设备名称已存在!");
} else {
}else{
return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment));
}
}

@ -307,6 +307,40 @@ public class WmsToWCSmissionController {
return AjaxResult.success(wmsProductPutService.ScanCodeSingleBox(wmsProductPutTrayCode));
}
/**
* 退--
*
*/
@PostMapping("/FinishedProductSalesReturn")
public AjaxResult FinishedProductSalesReturn(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
return AjaxResult.success(wmsProductPutService.FinishedProductSalesReturn(wmsRuturnPutEmbryo));
}
/**
* 退--
*
*/
@PostMapping("/FinishedProductSalesReturnConfirm")
public AjaxResult FinishedProductSalesReturnConfirm(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
return AjaxResult.success(wmsProductPutService.FinishedProductSalesReturnConfirm(wmsRuturnPutEmbryo));
}
/**
* --
*
*/
@PostMapping("/selectFinishedProductTransferAndOutbound")
public AjaxResult selectFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
return AjaxResult.success(wmsProductPutService.selectFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo));
}
/**
*
*/

@ -71,6 +71,19 @@ public class OdsProcureOutOrder extends BaseEntity {
*/
@Excel(name = "型号编码")
private String materialCode;
/**
* --
*/
@Excel(name = "型号编码")
private String materialCodeKEN;
public String getMaterialCodeKEN() {
return materialCodeKEN;
}
public void setMaterialCodeKEN(String materialCodeKEN) {
this.materialCodeKEN = materialCodeKEN;
}
/**
*

@ -0,0 +1,15 @@
package com.op.wms.domain;
import com.op.common.core.web.domain.BaseEntity;
/**
*
*/
public class WmsAllocationOutEmbryo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
}

@ -0,0 +1,469 @@
package com.op.wms.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 退
*/
public class WmsRuturnPutEmbryo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
/**
*
*/
@Excel(name = "工厂编码")
private String factoryCode;
/**
*退
*/
@Excel(name = "退货单")
private String productOrder;
/**
*
*/
@Excel(name = "仓库编码")
private String whCode;
/**
*
*/
@Excel(name = "库区编码")
private String waCode;
/**
*
*/
@Excel(name = "库位编码")
private String wlCode;
/**
*
*/
@Excel(name = "产品名称")
private String productName;
/**
*
*/
@Excel(name = "产品编码")
private String productCode;
/**
*
*/
@Excel(name = "产品分类")
private String productSort;
/**
*
*/
@Excel(name = "规格型号")
private String speciFication;
/**
*
*/
@Excel(name = "单位")
private String unitOfMeasure;
/**
*
*/
@Excel(name = "计划入库数量")
private BigDecimal planQuantity;
/**
*
*/
@Excel(name = "入库数量")
private BigDecimal putQuantity;
/**
*
*/
@Excel(name = "入库状态")
private String status;
/**
*SAP
*/
@Excel(name = "过账SAP状态")
private String sapStatus;
/**
*SAP
*/
@Excel(name = "过账SAP凭证")
private String sapProof;
/**
*sap
*/
@Excel(name = "过账sap返回信息")
private String sapMessage;
/**
*
*/
@Excel(name = "入库时间")
private Date putDate;
/**
*1
*/
@Excel(name = "预留字段1")
private String attr1;
/**
*2
*/
@Excel(name = "预留字段2")
private String attr2;
/**
*3
*/
@Excel(name = "预留字段3")
private String attr3;
/**
*4
*/
@Excel(name = "预留字段4")
private String attr4;
/**
*5
*/
@Excel(name = "预留字段5")
private String attr5;
/**
*6
*/
@Excel(name = "预留字段6")
private String attr6;
/**
*7
*/
@Excel(name = "预留字段7")
private String attr7;
/**
*8
*/
@Excel(name = "预留字段8")
private String attr8;
/**
*9
*/
@Excel(name = "预留字段9")
private String attr9;
/**
*10
*/
@Excel(name = "预留字段10")
private String attr10;
/**
*
*/
@Excel(name = "创建人")
private String createBy;
/**
*
*/
@Excel(name = "创建时间")
private Date createTime;
/**
*
*/
@Excel(name = "修改人")
private String updateBy;
/**
*
*/
@Excel(name = "修改时间")
private Date updateTime;
List<WmsProductPut> wmsProductPut;
private String activeFlag;
public String getActiveFlag() {
return activeFlag;
}
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public List<WmsProductPut> getWmsProductPut() {
return wmsProductPut;
}
public void setWmsProductPut(List<WmsProductPut> wmsProductPut) {
this.wmsProductPut = wmsProductPut;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getProductOrder() {
return productOrder;
}
public void setProductOrder(String productOrder) {
this.productOrder = productOrder;
}
public String getWhCode() {
return whCode;
}
public void setWhCode(String whCode) {
this.whCode = whCode;
}
public String getWaCode() {
return waCode;
}
public void setWaCode(String waCode) {
this.waCode = waCode;
}
public String getWlCode() {
return wlCode;
}
public void setWlCode(String wlCode) {
this.wlCode = wlCode;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductSort() {
return productSort;
}
public void setProductSort(String productSort) {
this.productSort = productSort;
}
public String getSpeciFication() {
return speciFication;
}
public void setSpeciFication(String speciFication) {
this.speciFication = speciFication;
}
public String getUnitOfMeasure() {
return unitOfMeasure;
}
public void setUnitOfMeasure(String unitOfMeasure) {
this.unitOfMeasure = unitOfMeasure;
}
public BigDecimal getPlanQuantity() {
return planQuantity;
}
public void setPlanQuantity(BigDecimal planQuantity) {
this.planQuantity = planQuantity;
}
public BigDecimal getPutQuantity() {
return putQuantity;
}
public void setPutQuantity(BigDecimal putQuantity) {
this.putQuantity = putQuantity;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getSapStatus() {
return sapStatus;
}
public void setSapStatus(String sapStatus) {
this.sapStatus = sapStatus;
}
public String getSapProof() {
return sapProof;
}
public void setSapProof(String sapProof) {
this.sapProof = sapProof;
}
public String getSapMessage() {
return sapMessage;
}
public void setSapMessage(String sapMessage) {
this.sapMessage = sapMessage;
}
public Date getPutDate() {
return putDate;
}
public void setPutDate(Date putDate) {
this.putDate = putDate;
}
public String getAttr1() {
return attr1;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr2() {
return attr2;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr3() {
return attr3;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr4() {
return attr4;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr5() {
return attr5;
}
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
public String getAttr6() {
return attr6;
}
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
public String getAttr7() {
return attr7;
}
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
public String getAttr8() {
return attr8;
}
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
public String getAttr9() {
return attr9;
}
public void setAttr9(String attr9) {
this.attr9 = attr9;
}
public String getAttr10() {
return attr10;
}
public void setAttr10(String attr10) {
this.attr10 = attr10;
}
@Override
public String getCreateBy() {
return createBy;
}
@Override
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String getUpdateBy() {
return updateBy;
}
@Override
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
@Override
public Date getUpdateTime() {
return updateTime;
}
@Override
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}

@ -0,0 +1,17 @@
package com.op.wms.mapper;
import com.op.wms.domain.WmsRuturnPutEmbryo;
import java.util.List;
public interface WmsRuturnPutEmbryoMapper {
List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryo(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
void updateWmsRuturnPutEmbryo(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1);
WmsRuturnPutEmbryo selectWmsRuturnPutEmbryoByid(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1);
void insertWmsRuturnPutEmbryoMapperRecords(WmsRuturnPutEmbryo wmsProductPutRecords);
}

@ -108,4 +108,16 @@ public interface IWmsProductPutService {
*
*/
List< WmsSellOutEmbryo> selectQueryFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
List< WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
/**
* 退-
* @param wmsRuturnPutEmbryo
* @return
*/
String FinishedProductSalesReturnConfirm(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo);
}

@ -61,6 +61,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
private WmsProductPutTrayCodeMapper wmsProductPutTrayCodeMapper;
@Autowired
private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper;
@Autowired
private WmsRuturnPutEmbryoMapper wmsRuturnPutEmbryoMapper;
/**
*
@ -787,4 +789,105 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
List<WmsSellOutEmbryo> wmsSellOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoList(wmsSellOutEmbryo);
return wmsSellOutEmbryoList;
}
@Override
public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());
List<WmsRuturnPutEmbryo> wmsRuturnPutEmbryoList= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryo(wmsRuturnPutEmbryo);
return wmsRuturnPutEmbryoList;
}
@Override
public String FinishedProductSalesReturnConfirm(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
Date date = new Date();
String formattedDate = dateFormat.format(date);//批次
List<WmsProductPut> wmsProductPutList = wmsRuturnPutEmbryo.getWmsProductPut();
WmsRuturnPutEmbryo wmsRuturnPutEmbryo1 = new WmsRuturnPutEmbryo();
//wms_product_put
wmsRuturnPutEmbryo1.setId(wmsRuturnPutEmbryo.getId());
//先查询一下,看看这次是不是可以出完
WmsRuturnPutEmbryo wmsRuturnPutEmbryo2= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoByid(wmsRuturnPutEmbryo1);
BigDecimal allTem= wmsRuturnPutEmbryo2.getPlanQuantity();
BigDecimal putTem= wmsRuturnPutEmbryo2.getPutQuantity();
//BigDecimal putQuantity= putTem.add(new BigDecimal(wmsRuturnPutEmbryo.get()));
int result = wmsRuturnPutEmbryo.getPutQuantity().compareTo(allTem);
if (result == 0) {
wmsRuturnPutEmbryo2.setStatus("1");//0是未完成1是完成
}
wmsRuturnPutEmbryo2.setPutQuantity(wmsRuturnPutEmbryo.getPutQuantity());
wmsRuturnPutEmbryo2.setUpdateBy(wmsRuturnPutEmbryo.getCreateBy());
wmsRuturnPutEmbryo2.setUpdateTime(new Date());
wmsRuturnPutEmbryoMapper.updateWmsRuturnPutEmbryo(wmsRuturnPutEmbryo2);
String SUCCESS = "操作成功";
for (WmsProductPut wmsProductPut1 :
wmsProductPutList) {
WmsRuturnPutEmbryo wmsProductPutRecords = new WmsRuturnPutEmbryo();
wmsProductPutRecords.setId(IdUtils.fastSimpleUUID());
wmsProductPutRecords.setProductOrder(wmsRuturnPutEmbryo.getProductOrder());
wmsProductPutRecords.setProductName(wmsRuturnPutEmbryo.getProductName());
wmsProductPutRecords.setProductCode(wmsRuturnPutEmbryo.getProductCode());
wmsProductPutRecords.setWhCode(wmsRuturnPutEmbryo.getWhCode());//仓库编码
wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode());//库位编码
wmsProductPutRecords.setAttr1(wmsProductPut1.getSn());////托盘号编码
wmsProductPutRecords.setAttr2(wmsProductPut1.getNumber());//箱数
wmsProductPutRecords.setCreateBy(wmsRuturnPutEmbryo.getCreateBy());
wmsProductPutRecords.setCreateTime(new Date());
wmsProductPutRecords.setActiveFlag("1");
wmsRuturnPutEmbryoMapper.insertWmsRuturnPutEmbryoMapperRecords(wmsProductPutRecords);
//wms_fp_storage_news_sn
WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn();
wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNewsSn.setFactoryCode(wmsRuturnPutEmbryo.getFactoryCode());
wmsFpStorageNewsSn.setWhCode(wmsRuturnPutEmbryo.getWhCode());//仓库编码
wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode());
wmsFpStorageNewsSn.setOrderNo(wmsRuturnPutEmbryo2.getId());
wmsFpStorageNewsSn.setProductCode(wmsRuturnPutEmbryo.getProductCode());
wmsFpStorageNewsSn.setProductName(wmsRuturnPutEmbryo.getProductName());
wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn());
wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
//wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber());
wmsFpStorageNewsSn.setUserDefined2(formattedDate);
wmsFpStorageNewsSn.setCreateBy(wmsRuturnPutEmbryo.getCreateBy());
wmsFpStorageNewsSn.setCreateTime(new Date());
wmsFpStorageNewsSn.setActiveFlag("1");
wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn);
// wms_fp_storage_news
WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();
wmsFpStorageNews.setWhCode(wmsRuturnPutEmbryo.getWhCode());//仓库编码
wmsFpStorageNews.setWlCode(wmsProductPut1.getWlCode());
wmsFpStorageNews.setStorageType("成品");
wmsFpStorageNews.setProductCode(wmsRuturnPutEmbryo.getProductCode());
wmsFpStorageNews.setProductName(wmsRuturnPutEmbryo.getProductName());
wmsFpStorageNews.setFactoryCode(wmsRuturnPutEmbryo.getFactoryCode());
wmsFpStorageNews.setActiveFlag("1");
wmsFpStorageNews.setUserDefined1(wmsRuturnPutEmbryo.getUnitOfMeasure());
List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
wmsFpStorageNews.setCreateBy(wmsRuturnPutEmbryo.getCreateBy());
wmsFpStorageNews.setCreateTime(new Date());
if (wmsFpStorageNewsList.size() > 0) {
WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0);
BigDecimal amount = wmsFpStorageNews1.getAmount();
BigDecimal amountAdd = amount.add(wmsFpStorageNews.getAmount());
wmsFpStorageNews1.setAmount(amountAdd);
wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews1);
} else {
wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews);
}
}
return SUCCESS;
}
@Override
public List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
return null;
}
}

@ -9,6 +9,7 @@
<result property="ID" column="ID"/>
<result property="produceCode" column="Produce_Code"/>
<result property="materialCode" column="Material_Code"/>
<result property="materialCodeKEN" column="materialCodeKEN"/>
<result property="materialDesc" column="Material_Desc"/>
<result property="planDate" column="Plan_Date"/>
<result property="planNumber" column="Plan_Number"/>
@ -283,6 +284,7 @@
mes_prepare.workorder_name,
mes_prepare_detail.prepare_id User_Defined2,
mes_prepare_detail.material_code Material_Code,
SUBSTRING(mes_prepare_detail.material_code, 8, LEN(mes_prepare_detail.material_code)) AS materialCodeKEN,
mes_prepare_detail.material_name Material_Desc,
mes_prepare_detail.prod_type User_Defined1,
mes_prepare_detail.unit Unit,

@ -48,7 +48,8 @@
<select id="selectWmsProductPutList" parameterType="WmsProductPut" resultMap="WmsProductPutResult">
<include refid="selectWmsProductPutVo"/>
<where>
<if test="workOrder != null and workOrder != ''">and work_order = #{workOrder}</if>
<if test="workOrder != null and workOrder != ''">and work_order like concat('%', #{workOrder},
'%') </if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
<if test="productOrder != null and productOrder != ''">and product_order = #{productOrder}</if>
<if test="whCode != null and whCode != ''">and wh_code = #{whCode}</if>
@ -57,7 +58,8 @@
<if test="productName != null and productName != ''">and product_name like concat('%', #{productName},
'%')
</if>
<if test="productCode != null and productCode != ''">and product_code = #{productCode}</if>
<if test="productCode != null and productCode != ''">and product_code like concat('%', #{productCode},
'%')</if>
<if test="productSort != null and productSort != ''">and product_sort = #{productSort}</if>
<if test="specification != null and specification != ''">and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">and unit_of_measure = #{unitOfMeasure}</if>

@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsRuturnPutEmbryoMapper">
<resultMap type="WmsRuturnPutEmbryo" id="WmsRuturnPutEmbryoResult">
<result property="id" column="id"/>
<result property="factoryCode" column="factoryCode"/>
<result property="productOrder" column="productOrder"/>
<result property="whCode" column="whCode"/>
<result property="waCode" column="waCode"/>
<result property="wlCode" column="wlCode"/>
<result property="productName" column="productName"/>
<result property="productCode" column="productCode"/>
<result property="productSort" column="productSort"/>
<result property="speciFication" column="speciFication"/>
<result property="unitOfMeasure" column="unitOfMeasure"/>
<result property="planQuantity" column="planQuantity"/>
<result property="putQuantity" column="putQuantity"/>
<result property="status" column="status"/>
<result property="sapStatus" column="sapStatus"/>
<result property="sapProof" column="sapProof"/>
<result property="sapMessage" column="sapMessage"/>
<result property="putDate" column="putDate"/>
<result property="attr1" column="attr1"/>
<result property="attr2" column="attr2"/>
<result property="attr3" column="attr3"/>
<result property="attr4" column="attr4"/>
<result property="attr5" column="attr5"/>
<result property="attr6" column="attr6"/>
<result property="attr7" column="attr7"/>
<result property="attr8" column="create_time"/>
<result property="attr9" column="attr9"/>
<result property="attr10" column="attr10"/>
<result property="createBy" column="createBy"/>
<result property="createTime" column="createTime"/>
<result property="updateBy" column="updateBy"/>
<result property="updateTime" column="updateTime"/>
</resultMap>
<select id="selectWmsRuturnPutEmbryo" resultMap="WmsRuturnPutEmbryoResult">
SELECT
wms_ruturn_put_embryo.id ,
wms_ruturn_put_embryo.factory_code As factoryCode,
wms_ruturn_put_embryo.product_order As productOrder ,
wms_ruturn_put_embryo.wh_code As whCode,
wms_ruturn_put_embryo.wa_code As waCode,
wms_ruturn_put_embryo.wl_code As wlCode,
wms_ruturn_put_embryo.product_name As productName,
wms_ruturn_put_embryo.product_code As productCode,
wms_ruturn_put_embryo.product_sort As productSort,
wms_ruturn_put_embryo.specification As speciFication,
wms_ruturn_put_embryo.unit_of_measure As unitOfMeasure,
wms_ruturn_put_embryo.plan_quantity As planQuantity,
COALESCE(wms_ruturn_put_embryo.put_quantity, 0) AS putQuantity,
wms_ruturn_put_embryo.status As status,
wms_ruturn_put_embryo.SAP_status As sapStatus,
wms_ruturn_put_embryo.SAP_proof As sapProof,
wms_ruturn_put_embryo.SAP_message As sapMessage,
wms_ruturn_put_embryo.put_date As putDate,
wms_ruturn_put_embryo.attr1 ,
wms_ruturn_put_embryo.attr2 ,
wms_ruturn_put_embryo.attr3 ,
wms_ruturn_put_embryo.attr4 ,
wms_ruturn_put_embryo.attr5 ,
wms_ruturn_put_embryo.attr6 ,
wms_ruturn_put_embryo.attr7,
wms_ruturn_put_embryo.attr8,
wms_ruturn_put_embryo.attr9,
wms_ruturn_put_embryo.attr10,
wms_ruturn_put_embryo.create_by As createBy,
wms_ruturn_put_embryo.create_time As createTime,
wms_ruturn_put_embryo.update_by As updateBy,
wms_ruturn_put_embryo.update_time As updateTime
FROM
wms_ruturn_put_embryo
where
active_flag='1' and product_order=#{productOrder}
</select>
<select id="selectWmsRuturnPutEmbryoByid" resultMap="WmsRuturnPutEmbryoResult">
SELECT
wms_ruturn_put_embryo.id ,
wms_ruturn_put_embryo.factory_code As factoryCode,
wms_ruturn_put_embryo.product_order As productOrder ,
wms_ruturn_put_embryo.wh_code As whCode,
wms_ruturn_put_embryo.wa_code As waCode,
wms_ruturn_put_embryo.wl_code As wlCode,
wms_ruturn_put_embryo.product_name As productName,
wms_ruturn_put_embryo.product_code As productCode,
wms_ruturn_put_embryo.product_sort As productSort,
wms_ruturn_put_embryo.specification As speciFication,
wms_ruturn_put_embryo.unit_of_measure As unitOfMeasure,
wms_ruturn_put_embryo.plan_quantity As planQuantity,
COALESCE(wms_ruturn_put_embryo.put_quantity, 0) AS putQuantity,
wms_ruturn_put_embryo.status As status,
wms_ruturn_put_embryo.SAP_status As sapStatus,
wms_ruturn_put_embryo.SAP_proof As sapProof,
wms_ruturn_put_embryo.SAP_message As sapMessage,
wms_ruturn_put_embryo.put_date As putDate,
wms_ruturn_put_embryo.attr1 ,
wms_ruturn_put_embryo.attr2 ,
wms_ruturn_put_embryo.attr3 ,
wms_ruturn_put_embryo.attr4 ,
wms_ruturn_put_embryo.attr5 ,
wms_ruturn_put_embryo.attr6 ,
wms_ruturn_put_embryo.attr7,
wms_ruturn_put_embryo.attr8,
wms_ruturn_put_embryo.attr9,
wms_ruturn_put_embryo.attr10,
wms_ruturn_put_embryo.create_by As createBy,
wms_ruturn_put_embryo.create_time As createTime,
wms_ruturn_put_embryo.update_by As updateBy,
wms_ruturn_put_embryo.update_time As updateTime
FROM
wms_ruturn_put_embryo
where
active_flag='1' and id=#{id}
</select>
<update id="updateWmsRuturnPutEmbryo" >
update wms_ruturn_put_embryo
<trim prefix="SET" suffixOverrides=",">
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="productOrder != null">product_order = #{productOrder},</if>
<if test="productCode != null">product_code = #{productCode},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="planQuantity != null">plan_quantity = #{planQuantity},</if>
<if test="putQuantity != null">put_quantity = #{putQuantity},</if>
<if test="status != null">status = #{status},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="attr5 != null">attr5 = #{attr5},</if>
<if test="attr6 != null">attr6 = #{attr6},</if>
<if test="attr7 != null">attr7 = #{attr7},</if>
<if test="attr8 != null">attr8 = #{attr8},</if>
<if test="attr9 != null">attr9 = #{attr9},</if>
<if test="attr10 != null">attr10 = #{attr10},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
</trim>
where id=#{id}
</update>
<insert id="insertWmsRuturnPutEmbryoMapperRecords">
insert into wms_ruturn_put_embryo_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="productOrder != null">product_order,</if>
<if test="whCode != null">wh_code,</if>
<if test="waCode != null">wa_code,</if>
<if test="wlCode != null">wl_code,</if>
<if test="productName != null">product_name,</if>
<if test="productCode != null">product_code,</if>
<if test="productSort != null">product_sort,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="planQuantity != null">plan_quantity,</if>
<if test="putQuantity != null">put_quantity,</if>
<if test="status != null">status,</if>
<if test="SAPStatus != null">SAP_status,</if>
<if test="SAPProof != null">SAP_proof,</if>
<if test="SAPMessage != null">SAP_message,</if>
<if test="putDate != null">put_date,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="attr5 != null">attr5,</if>
<if test="attr6 != null">attr6,</if>
<if test="attr7 != null">attr7,</if>
<if test="attr8 != null">attr8,</if>
<if test="attr9 != null">attr9,</if>
<if test="attr10 != null">attr10,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="activeFlag != null">active_flag,</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="productOrder != null">#{productOrder},</if>
<if test="whCode != null">#{whCode},</if>
<if test="waCode != null">#{waCode},</if>
<if test="wlCode != null">#{wlCode},</if>
<if test="productName != null">#{productName},</if>
<if test="productCode != null">#{productCode},</if>
<if test="productSort != null">#{productSort},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="planQuantity != null">#{planQuantity},</if>
<if test="putQuantity != null">#{putQuantity},</if>
<if test="status != null">#{status},</if>
<if test="SAPStatus != null">#{SAPStatus},</if>
<if test="SAPProof != null">#{SAPProof},</if>
<if test="SAPMessage != null">#{SAPMessage},</if>
<if test="putDate != null">#{putDate},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="attr5 != null">#{attr5},</if>
<if test="attr6 != null">#{attr6},</if>
<if test="attr7 != null">#{attr7},</if>
<if test="attr8 != null">#{attr8},</if>
<if test="attr9 != null">#{attr9},</if>
<if test="attr10 != null">#{attr10},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="activeFlag != null">#{activeFlag},</if>
</trim>
</insert>
</mapper>
Loading…
Cancel
Save