取消卷数优化

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

@@ -1871,9 +1871,7 @@ 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();//输出物料本次取消卷数
-                if (cancelProcessOperationVo.getSetoutcancelroll()) {
-                    apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
-                }
+                apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
                 Integer curStockCancelRoll = 0;//本次备料取消卷数
                 Integer curMoveCancelRoll = 0;//本次流转取消卷数
                 Integer curProdCancelRoll = 0;//本次成品取消卷数
@@ -1918,7 +1916,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlanprocessrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
                             cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                             cancelProcessOperationVo1.setSetincancelroll(false);
-                            cancelProcessOperationVo1.setSetoutcancelroll(cancelProcessOperationVo.getSetoutcancelroll());
                             cancelProcessOperation(cancelProcessOperationVo1);
                         } else {
                             break;

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CancelProcessOperationVo.java

@@ -11,8 +11,6 @@ public class CancelProcessOperationVo {
     private Integer curcancelroll;
     //是否更新输入已取消卷数
     private Boolean setincancelroll = true;
-    //是否更新输出已取消卷数
-    private Boolean setoutcancelroll = true;
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }