diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 68fa512..1cb7b4f 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -643,9 +643,13 @@ public class ScheduleServiceImpl implements ScheduleService { }else { sfdcRollData.setFgRollFlag("N"); sfdcRollData.setCqcNeedInspectFlag("N"); - sfdcRollData.setCqcPassFlag("N"); - sfdcRollData.setCqcInspectedFlag("N"); } + sfdcRollData.setCombineFlag("N"); + sfdcRollData.setVirtualRollFlag("N"); + sfdcRollData.setVirtualLinkRollNo(""); + sfdcRollData.setCqcPassFlag("N"); + sfdcRollData.setFinishedFlag("N"); + sfdcRollData.setCqcInspectedFlag("N"); //保存操作 scheduleMapper.insertSfdcRolls(sfdcRollData); @@ -656,8 +660,11 @@ public class ScheduleServiceImpl implements ScheduleService { sfdcRollOpsData.setOrderNo(orderNo); sfdcRollOpsData.setItemNo(itemNo); sfdcRollOpsData.setRollNo(currentRollNo); + sfdcRollOpsData.setScanBy(username); + sfdcRollOpsData.setScanDate(new Date()); sfdcRollOpsData.setSeqNo(seqNo); sfdcRollOpsData.setFinishedFlag("N"); + sfdcRollOpsData.setRemark(""); //保存数据 scheduleMapper.insertSfdcRollOps(sfdcRollOpsData); diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 0f81709..ac02dfd 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -787,9 +787,9 @@ INSERT INTO SFDC_RollOps(Site, OrderNo, RollNo, ItemNo, SeqNo, StartProdFlag, FinishedFlag, PauseFlag, - Remark, QtyReported, QtyDefected, ReportedFlag) + ScanedBy, ScanedDate, Remark, QtyReported, QtyDefected, ReportedFlag) VALUES(#{site}, #{orderNo}, #{rollNo}, #{itemNo}, #{seqNo}, #{startProdFlag}, #{finishedFlag}, #{pauseFlag}, - #{remark}, #{qtyReported}, #{qtyDefected}, #{reportedFlag}) + #{scanedBy}, #{scanedDate}, #{remark}, #{qtyReported}, #{qtyDefected}, #{reportedFlag})