Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -109,7 +109,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         put("ton", "吨");
     }};
 
-    DecimalFormat df = new DecimalFormat("0.####");
+    DecimalFormat df = new DecimalFormat("0.#####");
 
 
     /**
@@ -1871,8 +1871,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
                 Integer curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
-//                apsProcessOperationOutMaterDo = cancelProcessOperationOutMater(curOutMaterCancelRoll, apsProcessOperationOutMaterDo,apsProcessOperationDos);
-                apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
+                if(cancelProcessOperationVo.getSetcancelroll()){
+                    apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
+                }
                 Integer curStockCancelRoll = 0;//本次备料取消卷数
                 Integer curMoveCancelRoll = 0;//本次流转取消卷数
                 Integer curProdCancelRoll = 0;//本次成品取消卷数

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -478,10 +478,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     // 更新ID
                     apsProcessOperationDo.setId(data.getId());
                     apsProcessOperationDo.setBachmaterialprocess(strAppendListConvertStr(oldNums, strings));
-                    // 更新剩余待报工卷数
-                    apsProcessOperationDo.setLeavewaitjobroll(data.getLeavewaitjobroll() + strings.size());
-                    // 更新剩余待开工卷数
-                    apsProcessOperationDo.setLeavewaitworkroll(data.getLeavewaitworkroll() + strings.size());
+//                    // 更新剩余待报工卷数
+//                    apsProcessOperationDo.setLeavewaitjobroll(data.getLeavewaitjobroll() - strings.size());
+//                    // 更新剩余待开工卷数
+//                    apsProcessOperationDo.setLeavewaitworkroll(data.getLeavewaitworkroll() - strings.size());
                     apsProcessOperationDo.setModifydate(new Date());
                     apsProcessOperationDo.setBachmaterialprocess(strAppendListConvertStr(data.getBachmaterialprocess(), strings));
                     updateProcessData.add(apsProcessOperationDo);