From 6c4dffffcd3bbcc338ad9ababa0f8f6f5fe16d82 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Thu, 23 Jun 2022 11:43:38 +0800
Subject: [PATCH] =?UTF-8?q?2022-06-23=20=E6=B4=BE=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=20=E6=9C=AA=E7=94=9F=E4=BA=A7=E4=B8=8B?=
 =?UTF-8?q?=E6=9C=BA=E6=8B=86=E5=8D=B7=E6=A0=A1=E9=AA=8CBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java       | 9 +++++++--
 1 file changed, 7 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 0434b17..89924b2 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
@@ -1967,7 +1967,12 @@ public class ScheduleServiceImpl implements ScheduleService {
         Float editTotalReportQty = pageData.getTotalQty();//总数量
         Float editTotalApprovedQty = pageData.getApprovedQty();//总量数量
         Float otherRollQty = pageData.getOtherRollQty();
-        Float editNewRollQty = pageData.getEditNewRollQty();
+        //Float editNewRollQty = pageData.getEditNewRollQty();
+        Double editNewRollQty = pageData.getNewCreateRollQty();
+        //判断null
+        if(editNewRollQty == null){
+            editNewRollQty = 0d;
+        }
         String scheduledDate = pageData.getScheduledDate();
         String shiftDesc = pageData.getShiftDesc();
         String shiftNo = pageData.getShiftNo();
@@ -2089,7 +2094,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @Param [site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo]
      **/
     public Map<String, Object> checkFinishRollWithSfdcMaterialHist(String site, String orderNo, Integer itemNo, String rollNo, String seqNo, Float editTotalReportQty, Float otherRollQty,
-                                                                   Float editNewRollQty, Float netIssueQty, Integer histSeqNo, String username) {
+                                                                   Double editNewRollQty, Float netIssueQty, Integer histSeqNo, String username) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);