工序调整

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

@@ -782,10 +782,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 List<ApsProcessOperationDo> apsProcessOperationDos = processOperationDoList.stream().filter(apo -> apsProcessOperationOutMaterDo.getId().equals(apo.getPlaninputid())).collect(Collectors.toList());
                 for (ApsProcessOperationDo apsProcessOperationDo : apsProcessOperationDos) {
                     //更新输入
-                    apsProcessOperationDo.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid());
-                    apsProcessOperationDo.setProducttype(apsProcessOperationOutMaterDo.getProducttype());
-                    apsProcessOperationDo.setMetal(apsProcessOperationOutMaterDo.getMetal());
-                    apsProcessOperationDo.setMetalstate(apsProcessOperationOutMaterDo.getMetalstate());
+                    apsProcessOperationDo.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid() == null ? "" : apsProcessOperationOutMaterDo.getProducttypeid());
+                    apsProcessOperationDo.setProducttype(apsProcessOperationOutMaterDo.getProducttype() == null ? "" : apsProcessOperationOutMaterDo.getProducttype());
+                    apsProcessOperationDo.setMetal(apsProcessOperationOutMaterDo.getMetal() == null ? "" : apsProcessOperationOutMaterDo.getMetal());
+                    apsProcessOperationDo.setMetalstate(apsProcessOperationOutMaterDo.getMetalstate() == null ? "" : apsProcessOperationOutMaterDo.getMetalstate());
 
                     apsProcessOperationDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
                     apsProcessOperationDo.setProwidth(apsProcessOperationOutMaterDo.getProwidth());
@@ -832,18 +832,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo1 : apsProcessOperationOutMaterDoList1) {
                         String outProducttype = apsProcessOperationOutMaterDo1.getProducttype();
                         if (apsProcessOperationOutMaterDo1.getProducttyperule().equals("不变")) {
-                            apsProcessOperationOutMaterDo1.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid());
-                            outProducttype = apsProcessOperationOutMaterDo.getProducttype();
+                            apsProcessOperationOutMaterDo1.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid() == null ? "" : apsProcessOperationOutMaterDo.getProducttypeid());
+                            outProducttype = apsProcessOperationOutMaterDo.getProducttype() == null ? "" : apsProcessOperationOutMaterDo.getProducttype();
                             apsProcessOperationOutMaterDo1.setProducttype(outProducttype);
                         }
                         String outMeter = apsProcessOperationOutMaterDo1.getMetal();
                         if (apsProcessOperationOutMaterDo1.getMetalrule().equals("不变")) {
-                            outMeter = apsProcessOperationOutMaterDo.getMetal();
+                            outMeter = apsProcessOperationOutMaterDo.getMetal() == null ? "" : apsProcessOperationOutMaterDo.getMetal();
                             apsProcessOperationOutMaterDo1.setMetal(outMeter);
                         }
                         String outMetalstate = apsProcessOperationOutMaterDo1.getMetalstate();
                         if (apsProcessOperationOutMaterDo1.getMetalstaterule().equals("不变")) {
-                            outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
+                            outMetalstate = apsProcessOperationOutMaterDo.getMetalstate() == null ? "" : apsProcessOperationOutMaterDo.getMetalstate();
                             apsProcessOperationOutMaterDo1.setMetalstate(outMetalstate);
                         }