如果工序作业的产品类型，合金，宽度，厚度规则为自定义，并且没有值，默认填入上一作业的输出物料的产品类型，合金，宽度，厚度，用户可以修改

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

@@ -302,18 +302,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                             apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                             String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
-                            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getProducttypeid()))) {
                                 outProducttype = outMaterDo.getProducttype() == null ? "" : outMaterDo.getProducttype();
                                 apsProcessOperationOutMaterDo.setProducttypeid(outMaterDo.getProducttypeid() == null ? "" : outMaterDo.getProducttypeid());
                                 apsProcessOperationOutMaterDo.setProducttype(outProducttype);
                             }
                             String outMeter = apsProcessOperationOutMaterDo.getMetal();
-                            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo.getMetalrule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetal()))) {
                                 outMeter = outMaterDo.getMetal() == null ? "" : outMaterDo.getMetal();
                                 apsProcessOperationOutMaterDo.setMetal(outMeter);
                             }
                             String outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
-                            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetalstate()))) {
                                 outMetalstate = outMaterDo.getMetalstate() == null ? "" : outMaterDo.getMetalstate();
                                 apsProcessOperationOutMaterDo.setMetalstate(outMetalstate);
                             }
@@ -476,18 +476,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                         apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                         String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
-                        if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getProducttypeid()))) {
                             outProducttype = blanckdata.getStr("PRODUCTTYPE") == null ? "" : blanckdata.getStr("PRODUCTTYPE");
                             apsProcessOperationOutMaterDo.setProducttypeid(blanckdata.getStr("PRODUCTTYPEID") == null ? "" : blanckdata.getStr("PRODUCTTYPEID"));
                             apsProcessOperationOutMaterDo.setProducttype(outProducttype);
                         }
                         String outMeter = apsProcessOperationOutMaterDo.getMetal();
-                        if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo.getMetalrule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetal()))) {
                             outMeter = blanckdata.getStr("ALLOY") == null ? "" : blanckdata.getStr("ALLOY");
                             apsProcessOperationOutMaterDo.setMetal(outMeter);
                         }
                         String outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
-                        if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetalstate()))) {
                             outMetalstate = blanckdata.getStr("ALLOYSTATUS") == null ? "" : blanckdata.getStr("ALLOYSTATUS");
                             apsProcessOperationOutMaterDo.setMetalstate(outMetalstate);
                         }
@@ -787,18 +787,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             processOperationOutMaterDo.setId(SecurityUtil.getUUID());
 
                             String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
-                            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getProducttypeid()))) {
                                 outProducttype = outMaterDo.getProducttype() == null ? "" : outMaterDo.getProducttype();
                                 processOperationOutMaterDo.setProducttypeid(outMaterDo.getProducttypeid() == null ? "" : outMaterDo.getProducttypeid());
                                 processOperationOutMaterDo.setProducttype(outProducttype);
                             }
                             String outMeter = apsProcessOperationOutMaterDo.getMetal();
-                            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo.getMetalrule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getMetal()))) {
                                 outMeter = outMaterDo.getMetal() == null ? "" : outMaterDo.getMetal();
                                 processOperationOutMaterDo.setMetal(outMeter);
                             }
                             String outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
-                            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义")) {
+                            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getMetalstate()))) {
                                 outMetalstate = outMaterDo.getMetalstate() == null ? "" : outMaterDo.getMetalstate();
                                 processOperationOutMaterDo.setMetalstate(outMetalstate);
                             }
@@ -985,18 +985,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationOutMaterDo.setId(SecurityUtil.getUUID());
                         processOperationOutMaterDo.setRoption(apsProcessOperationOutMaterDo.getId());
                         String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
-                        if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getProducttypeid()))) {
                             outProducttype = blanckdata.getStr("PRODUCTTYPE") == null ? "" : blanckdata.getStr("PRODUCTTYPE");
                             processOperationOutMaterDo.setProducttypeid(blanckdata.getStr("PRODUCTTYPEID") == null ? "" : blanckdata.getStr("PRODUCTTYPEID"));
                             processOperationOutMaterDo.setProducttype(outProducttype);
                         }
                         String outMeter = apsProcessOperationOutMaterDo.getMetal();
-                        if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo.getMetalrule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getMetal()))) {
                             outMeter = blanckdata.getStr("ALLOY") == null ? "" : blanckdata.getStr("ALLOY");
                             processOperationOutMaterDo.setMetal(outMeter);
                         }
                         String outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
-                        if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(processOperationOutMaterDo.getMetalstate()))) {
                             outMetalstate = blanckdata.getStr("ALLOYSTATUS") == null ? "" : blanckdata.getStr("ALLOYSTATUS");
                             processOperationOutMaterDo.setMetalstate(outMetalstate);
                         }
@@ -1398,18 +1398,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     Integer outval = 0;
                     for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo1 : apsProcessOperationOutMaterDoList1) {
                         String outProducttype = apsProcessOperationOutMaterDo1.getProducttype();
-                        if (apsProcessOperationOutMaterDo1.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo1.getProducttyperule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo1.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo1.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo1.getProducttypeid()))) {
                             apsProcessOperationOutMaterDo1.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid() == null ? "" : apsProcessOperationOutMaterDo.getProducttypeid());
                             outProducttype = apsProcessOperationOutMaterDo.getProducttype() == null ? "" : apsProcessOperationOutMaterDo.getProducttype();
                             apsProcessOperationOutMaterDo1.setProducttype(outProducttype);
                         }
                         String outMeter = apsProcessOperationOutMaterDo1.getMetal();
-                        if (apsProcessOperationOutMaterDo1.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo1.getMetalrule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo1.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo1.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo1.getMetal()))) {
                             outMeter = apsProcessOperationOutMaterDo.getMetal() == null ? "" : apsProcessOperationOutMaterDo.getMetal();
                             apsProcessOperationOutMaterDo1.setMetal(outMeter);
                         }
                         String outMetalstate = apsProcessOperationOutMaterDo1.getMetalstate();
-                        if (apsProcessOperationOutMaterDo1.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo1.getMetalstaterule().equals("自定义")) {
+                        if (apsProcessOperationOutMaterDo1.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo1.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo1.getMetalstate()))) {
                             outMetalstate = apsProcessOperationOutMaterDo.getMetalstate() == null ? "" : apsProcessOperationOutMaterDo.getMetalstate();
                             apsProcessOperationOutMaterDo1.setMetalstate(outMetalstate);
                         }
@@ -1732,18 +1732,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         Integer outval = 0;
         for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
             String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
-            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义")) {
+            if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变") || (apsProcessOperationOutMaterDo.getProducttyperule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getProducttypeid()))) {
                 outProducttype = blanckdata.getStr("PRODUCTTYPE") == null ? "" : blanckdata.getStr("PRODUCTTYPE");
                 apsProcessOperationOutMaterDo.setProducttypeid(blanckdata.getStr("PRODUCTTYPEID") == null ? "" : blanckdata.getStr("PRODUCTTYPEID"));
                 apsProcessOperationOutMaterDo.setProducttype(outProducttype);
             }
             String outMeter = apsProcessOperationOutMaterDo.getMetal();
-            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || apsProcessOperationOutMaterDo.getMetalrule().equals("自定义")) {
+            if (apsProcessOperationOutMaterDo.getMetalrule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalrule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetal()))) {
                 outMeter = blanckdata.getStr("ALLOY") == null ? "" : blanckdata.getStr("ALLOY");
                 apsProcessOperationOutMaterDo.setMetal(outMeter);
             }
             String outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
-            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义")) {
+            if (apsProcessOperationOutMaterDo.getMetalstaterule().equals("不变") || (apsProcessOperationOutMaterDo.getMetalstaterule().equals("自定义") && ObjectUtil.isEmpty(apsProcessOperationOutMaterDo.getMetalstate()))) {
                 outMetalstate = blanckdata.getStr("ALLOYSTATUS") == null ? "" : blanckdata.getStr("ALLOYSTATUS");
                 apsProcessOperationOutMaterDo.setMetalstate(outMetalstate);
             }