From e0b0c1a159668a2d22e766ba45e1d7ec61ad05a2 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Sun, 19 Dec 2021 14:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=B0=E5=8D=B7BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java    | 11 +++++++++--
 src/main/resources/mapper/schedule/ScheduleMapper.xml |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

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 @@
     <!--插入sfdcRollOps的数据-->
     <insert id="insertSfdcRollOps" parameterType="SfdcRollData">
         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})
     </insert>