From 7e13a44516420bbbf2f134120394dfcd8047ec15 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Sat, 7 May 2022 10:29:53 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-07=20=E4=BA=A7=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=97=A5=E6=9C=9F=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 541535e..76e438f 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
@@ -3484,6 +3484,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         String username = pageData.getUsername();
         String operatorId = pageData.getOperatorId();
         Float defectedQty = pageData.getDefectedQty();
+        String scheduledDate = pageData.getScheduledDate();
+        String shiftNo = pageData.getShiftDesc();
+        String currentTime = pageData.getReportedTime();
 
         Float sfdcReportedQty = pageData.getSfdcReportedQty();//报告数量
         Float sfdcApprovedQty = pageData.getSfdcApprovedQty();//合格数量
@@ -3504,7 +3507,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //1.调用存储过程 处理Sfdc和派工单
         this.finishPartRollProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, rollNo, sfdcReportedQty, sfdcApprovedQty,
                 sfdcSetupTime, sfdcProdTime, sfdcDownTime, eventTime, tillTime, remark,
-                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId);
+                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, currentTime, scheduledDate, shiftNo);
         //2.调用存储过程 处理异常信息
         if ("Y".equalsIgnoreCase(exceptionFlag)) {
             this.finishRollProcessException(site, orderNo, itemNo, seqNo, rollNo, exceptionReason, username);
@@ -3519,7 +3522,8 @@ public class ScheduleServiceImpl implements ScheduleService {
      **/
     public void finishPartRollProcessSfdcAndSchedule(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float sfdcReportedQty, Float sfdcApproveQty,
                                                      Float sfdcSetupTime, Float sfdcProdTime, Float sfdcDownTime, String eventTime, String tillTime, String remark,
-                                                     Float sfdcSetupDownTime, Float sfdcProdSetupTime, Float defectedQty, Float sfdcManufactureTime, String username) {
+                                                     Float sfdcSetupDownTime, Float sfdcProdSetupTime, Float defectedQty, Float sfdcManufactureTime, String username,
+                                                     String currentTime, String scheduledDate, String shiftNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -3541,6 +3545,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(defectedQty);
         params.add(sfdcManufactureTime);
         params.add(username);
+        params.add(currentTime);
+        params.add(scheduledDate);
+        params.add(shiftNo);
         //执行存储过程
         procedureMapper.execProduceData("finishPartRollProcessSfdcAndSchedule", params);
     }