工序作业优化

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

@@ -91,8 +91,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     /**
      * 根据工序ID 获取当前工序之后的所有工序信息 包含当前工序
      */
-    public  List<ProcessIdRelationVo> getAllNextProcessOperationById(List<String> ids){
-        return  apsProcessOperationDao.getAllNextProcessOperationById(ids);
+    public List<ProcessIdRelationVo> getAllNextProcessOperationById(List<String> ids) {
+        return apsProcessOperationDao.getAllNextProcessOperationById(ids);
     }
 
     /*
@@ -177,7 +177,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationDo.setPreviousprocess(processVo.get(0).getProcessName());
                             apsProcessOperationDo.setPlaninputid(outMaterDo.getId());
                             String meterInput = getInMeterInfo(outMaterDo.getProducttype(), outMaterDo.getMetal(), outMaterDo.getMetalstate(), outMaterDo.getThickness(), outMaterDo.getProwidth(), outMaterDo.getProlength());
-//                            apsProcessOperationDo.setPlaninput(meterInput + outMaterDo.getSinglerollweight() + cxAdminFeginClient.getDictNameByValue("MATERIAL_UNIT", outMaterDo.getNumunit()));
                             apsProcessOperationDo.setPlaninput(meterInput + outMaterDo.getSinglerollweight() + UNIT_MAP.getOrDefault(outMaterDo.getNumunit(), ""));
                             apsProcessOperationDo.setProducttypeid(outMaterDo.getProducttypeid());
                             apsProcessOperationDo.setProducttype(outMaterDo.getProducttype());
@@ -192,7 +191,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationDo.setBlankid(blanckdata.getStr("ID"));
                             apsProcessOperationDo.setCraftstepid(apsCraftRouteStepDo1.getId());
                             if (outMaterDo.getThickrule().equals("自定义") || outMaterDo.getWidthrule().equals("自定义") || outMaterDo.getLengthrule().equals("自定义")) {
-                                apsProcessOperationDo.setChangeinmeter("1");//输入物料是否可编辑
+                                apsProcessOperationDo.setChangeinmeter("1");//输入物料可编辑
                             }
 
                             //本道工序信息
@@ -241,15 +240,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setMainid(processId);
                             apsProcessOperationOutMaterDo.setBlankid(blanckdata.getStr("ID"));
                             //输出物料
-                            String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "") + "*" + blanckdata.getInt("ROLLNUM") + "卷";
-                            apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter);
-                            apsProcessOperationDo.setPlanoutput("[1]" + outputMeter);
+                            String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "");
+                            apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
+                            apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                             //输出成品 没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划成品卷数}卷”
                             String outputfinishproduct = "";
                             if (StringUtils.isBlank(apsCraftRouteStepDo1.getNextstepid())) {
-                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "*" + blanckdata.getInt("ROLLNUM") + "卷";
+                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + blanckdata.getInt("ROLLNUM") + "卷";
                             }
                             apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                            apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
                             previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 
 
@@ -366,15 +366,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo.setMainid(processId);
                         apsProcessOperationOutMaterDo.setBlankid(blanckdata.getStr("ID"));
                         //输出物料
-                        String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "") + "*" + blanckdata.getInt("ROLLNUM") + "卷";
-                        apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter);
-                        apsProcessOperationDo.setPlanoutput("[1]" + outputMeter);
+                        String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "");
+                        apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
+                        apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         //输出成品 没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划成品卷数}卷”
                         String outputfinishproduct = "";
                         if (StringUtils.isBlank(apsCraftRouteStepDo.getNextstepid())) {
-                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "*" + blanckdata.getInt("ROLLNUM") + "卷";
+                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + blanckdata.getInt("ROLLNUM") + "卷";
                         }
                         apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                        apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
 
                         previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationOutMaterDo.java

@@ -154,7 +154,7 @@ public class ApsProcessOperationOutMaterDo extends BaseDo implements Serializabl
     private Integer outval;
 
     /**
-     * 输出物料要求
+     * 前道工序输出物料要求
      */
     private String outmaterrequest;