2022-06-23 派工单报工 未生产下机拆卷校验BUG

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);