工序优化

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

@@ -189,8 +189,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationDo.setProwidth(outMaterDo.getProwidth());
                             apsProcessOperationDo.setProlength(outMaterDo.getProlength());
                             apsProcessOperationDo.setSinglerollweight(outMaterDo.getSinglerollweight());
-                            apsProcessOperationDo.setPlaninrall(outMaterDo.getPlanrollnum() - outMaterDo.getPlanstockrollnum() - outMaterDo.getPlanprodrollnum());
-                            apsProcessOperationDo.setPlanprocessrall(outMaterDo.getPlanrollnum() - outMaterDo.getPlanstockrollnum() - outMaterDo.getPlanprodrollnum());
+                            Integer planInRall = outMaterDo.getPlanrollnum() - outMaterDo.getPlanstockrollnum() - outMaterDo.getPlanprodrollnum();
+                            apsProcessOperationDo.setPlaninrall(planInRall);
+                            apsProcessOperationDo.setPlanprocessrall(planInRall);
+                            apsProcessOperationDo.setUnfinishroll(planInRall);
                             apsProcessOperationDo.setBlankid(blanckdata.getStr("ID"));
                             apsProcessOperationDo.setCraftstepid(apsCraftRouteStepDo1.getId());
                             if (outMaterDo.getThickrule().equals("自定义") || outMaterDo.getWidthrule().equals("自定义") || outMaterDo.getLengthrule().equals("自定义")) {
@@ -329,6 +331,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationDo.setSinglerollweight(blanckdata.getBigDecimal("SINGLEROLLWEIGHT"));
                         apsProcessOperationDo.setPlaninrall(blanckdata.getInt("ROLLNUM"));
                         apsProcessOperationDo.setPlanprocessrall(blanckdata.getInt("ROLLNUM"));
+                        apsProcessOperationDo.setUnfinishroll(blanckdata.getInt("ROLLNUM"));
                         apsProcessOperationDo.setBlankid(blanckdata.getStr("ID"));
                         apsProcessOperationDo.setCraftstepid(apsCraftRouteStepDo.getId());
 
@@ -572,6 +575,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     Integer planinrall = apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanstockrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum();
                     apsProcessOperationDo.setPlaninrall(planinrall);
                     apsProcessOperationDo.setPlanprocessrall(planinrall);
+                    apsProcessOperationDo.setUnfinishroll(planinrall - apsProcessOperationDo.getCheckoutroll());
                     String meterInput = getInMeterInfo(apsProcessOperationOutMaterDo.getProducttype(), apsProcessOperationOutMaterDo.getMetal(), apsProcessOperationOutMaterDo.getMetalstate(), apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getProlength());
                     apsProcessOperationDo.setPlaninput(meterInput + apsProcessOperationOutMaterDo.getSinglerollweight() + UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo.getNumunit(), ""));