更新工序作业优化

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

@@ -313,8 +313,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setProwidth(wval);
                             BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                             apsProcessOperationOutMaterDo.setProlength(lval);
-//                            apsProcessOperationOutMaterDo.setRipcutnum(1);
-//                            apsProcessOperationOutMaterDo.setCrosscutnum(1);
                             apsProcessOperationOutMaterDo.setOutval(1);
                             apsProcessOperationOutMaterDo.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall());
                             //输入单卷重*输出宽度/输入宽度
@@ -351,6 +349,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             }
                             apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
                             apsProcessOperationOutMaterDo.setPlanmoverollnum(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationOutMaterDo.getPlanprodrollnum());
+                            apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getPlanprodrollnum());
+                            apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum());
                             previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 
 
@@ -508,6 +508,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
                         }
                         apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
+                        apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getPlanprodrollnum());
+                        apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum());
 
                         previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 
@@ -797,6 +799,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             processOperationOutMaterDo.setMainid(processId);
                             processOperationOutMaterDo.setBlankid(blanckdata.getStr("ID"));
                             processOperationOutMaterDo.setPlanmoverollnum(processOperationOutMaterDo.getPlanrollnum() - processOperationOutMaterDo.getPlanprodrollnum() - processOperationOutMaterDo.getPlanstockrollnum());
+                            processOperationOutMaterDo.setProdleaveoutroll(processOperationOutMaterDo.getPlanprodrollnum() - processOperationOutMaterDo.getProdoutroll() - processOperationOutMaterDo.getProdcancelroll());
+                            processOperationOutMaterDo.setMoveleaveoutroll(processOperationOutMaterDo.getPlanmoverollnum() - processOperationOutMaterDo.getMoveoutroll() - processOperationOutMaterDo.getMovecancelroll());
+                            processOperationOutMaterDo.setStockleaveoutroll(processOperationOutMaterDo.getPlanstockrollnum() - processOperationOutMaterDo.getStockoutroll() - processOperationOutMaterDo.getStockcancelroll());
                             apsProcessOperationOutMaterDoList.add(processOperationOutMaterDo);
                         }
                         previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList);
@@ -931,6 +936,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         planoutputList.add(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         processOperationOutMaterDo.setMainid(processId);
                         processOperationOutMaterDo.setBlankid(blanckdata.getStr("ID"));
+                        processOperationOutMaterDo.setProdleaveoutroll(processOperationOutMaterDo.getPlanprodrollnum() - processOperationOutMaterDo.getProdoutroll() - processOperationOutMaterDo.getProdcancelroll());
+                        processOperationOutMaterDo.setMoveleaveoutroll(processOperationOutMaterDo.getPlanmoverollnum() - processOperationOutMaterDo.getMoveoutroll() - processOperationOutMaterDo.getMovecancelroll());
+                        processOperationOutMaterDo.setStockleaveoutroll(processOperationOutMaterDo.getPlanstockrollnum() - processOperationOutMaterDo.getStockoutroll() - processOperationOutMaterDo.getStockcancelroll());
                         apsProcessOperationOutMaterDoList.add(processOperationOutMaterDo);
                     }
                     previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList);
@@ -1333,6 +1341,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         }
                         apsProcessOperationOutMaterDo1.setOutputfinishproduct(outputfinishproduct);
                         apsProcessOperationOutMaterDo1.setPlanmoverollnum(apsProcessOperationOutMaterDo1.getPlanrollnum() - apsProcessOperationOutMaterDo1.getPlanprodrollnum() - apsProcessOperationOutMaterDo1.getPlanstockrollnum());
+                        apsProcessOperationOutMaterDo1.setProdleaveoutroll(apsProcessOperationOutMaterDo1.getPlanprodrollnum() - apsProcessOperationOutMaterDo1.getProdoutroll() - apsProcessOperationOutMaterDo1.getProdcancelroll());
+                        apsProcessOperationOutMaterDo1.setMoveleaveoutroll(apsProcessOperationOutMaterDo1.getPlanmoverollnum() - apsProcessOperationOutMaterDo1.getMoveoutroll() - apsProcessOperationOutMaterDo1.getMovecancelroll());
+                        apsProcessOperationOutMaterDo1.setStockleaveoutroll(apsProcessOperationOutMaterDo1.getPlanstockrollnum() - apsProcessOperationOutMaterDo1.getStockoutroll() - apsProcessOperationOutMaterDo1.getStockcancelroll());
 
                         apsProcessOperationOutMaterDoNewList.add(apsProcessOperationOutMaterDo1);
                         if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid())) {
@@ -1648,6 +1659,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             }
             apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
             apsProcessOperationOutMaterDo.setPlanmoverollnum(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum() - apsProcessOperationOutMaterDo.getPlanstockrollnum());
+            apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getPlanprodrollnum() - apsProcessOperationOutMaterDo.getProdoutroll() - apsProcessOperationOutMaterDo.getProdcancelroll());
+            apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanmoverollnum() - apsProcessOperationOutMaterDo.getMoveoutroll() - apsProcessOperationOutMaterDo.getMovecancelroll());
+            apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getPlanstockrollnum() - apsProcessOperationOutMaterDo.getStockoutroll() - apsProcessOperationOutMaterDo.getStockcancelroll());
 
             apsProcessOperationOutMaterDoNewList.add(apsProcessOperationOutMaterDo);
             if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid())) {