更新工序作业优化

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

@@ -1914,7 +1914,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 cancelroll = processOperationDo.getLeavewaitworkroll();
                                 cancelProcessOperationVo1.setCurcancelroll(cancelroll);
                             }
-                            processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlaninrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
+                            processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlanprocessrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
                             cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                             cancelProcessOperationVo1.setSetcancelroll(cancelProcessOperationVo.getSetcancelroll());
                             cancelProcessOperation(cancelProcessOperationVo1);
@@ -2030,7 +2030,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     }
 
     //获取输入已取消卷数
-    private Integer getInputCancelRoll(Integer planInRoll, Integer cancelRoll, ApsProcessOperationOutMaterDo outMaterDo) {
+    private Integer getInputCancelRoll(Integer planPrecessRoll, Integer cancelRoll, ApsProcessOperationOutMaterDo outMaterDo) {
         Integer inputCancelRoll = 0;
         if (outMaterDo.getOutcancelroll() + outMaterDo.getFailrollnum() > outMaterDo.getPlanstockrollnum()) {
             if (outMaterDo.getPlanstockrollnum() == 0 && outMaterDo.getPlanprodrollnum() == 0) {//没有计划备料卷数和计划成品卷数
@@ -2038,16 +2038,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             } else if (outMaterDo.getPlanstockrollnum() > 0 && outMaterDo.getPlanprodrollnum() == 0) {//有计划备料卷数，无计划成品卷数
                 inputCancelRoll = outMaterDo.getFailrollnum() + outMaterDo.getOutcancelroll() - outMaterDo.getPlanstockrollnum();
             } else if (outMaterDo.getPlanstockrollnum() == 0 && outMaterDo.getPlanprodrollnum() > 0) {//无计划备料卷数，有计划成品卷数
-                Integer tempRoll = planInRoll - cancelRoll - outMaterDo.getFailrollnum();
+                Integer tempRoll = planPrecessRoll - cancelRoll - outMaterDo.getFailrollnum();
                 if (tempRoll < outMaterDo.getPlanprodrollnum()) {
-                    inputCancelRoll = planInRoll - outMaterDo.getPlanprodrollnum();
+                    inputCancelRoll = planPrecessRoll - outMaterDo.getPlanprodrollnum();
                 } else {
                     inputCancelRoll = outMaterDo.getOutcancelroll() + outMaterDo.getFailrollnum();
                 }
             } else {//有计划备料卷数，有计划成品卷数
-                Integer tempRoll = planInRoll - cancelRoll - outMaterDo.getFailrollnum();
+                Integer tempRoll = planPrecessRoll - cancelRoll - outMaterDo.getFailrollnum();
                 if (tempRoll < outMaterDo.getPlanprodrollnum()) {
-                    inputCancelRoll = planInRoll - outMaterDo.getPlanprodrollnum() - outMaterDo.getPlanstockrollnum();
+                    inputCancelRoll = planPrecessRoll - outMaterDo.getPlanprodrollnum() - outMaterDo.getPlanstockrollnum();
                 } else {
                     inputCancelRoll = outMaterDo.getOutcancelroll() + outMaterDo.getFailrollnum() - outMaterDo.getPlanstockrollnum();
                 }