Merge remote-tracking branch 'origin/master'

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

@@ -815,24 +815,23 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList1 = processOperationOutMaterDoList.stream().filter(apoom -> apsProcessOperationDo.getId().equals(apoom.getMainid())).collect(Collectors.toList());
                     List<String> planoutputList = new ArrayList<>();
                     for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo1 : apsProcessOperationOutMaterDoList1) {
-                        if (StringUtils.isBlank(apsProcessOperationOutMaterDo1.getProducttypeid())) {
-                            apsProcessOperationOutMaterDo1.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid());
-                        }
                         String outProducttype = apsProcessOperationOutMaterDo1.getProducttype();
-                        if (StringUtils.isBlank(outProducttype)) {
+                        if (apsProcessOperationOutMaterDo1.getProducttyperule().equals("不变")) {
+                            apsProcessOperationOutMaterDo1.setProducttypeid(apsProcessOperationOutMaterDo.getProducttypeid());
                             outProducttype = apsProcessOperationOutMaterDo.getProducttype();
                             apsProcessOperationOutMaterDo1.setProducttype(outProducttype);
                         }
                         String outMeter = apsProcessOperationOutMaterDo1.getMetal();
-                        if (StringUtils.isBlank(outMeter)) {
+                        if (apsProcessOperationOutMaterDo1.getMetalrule().equals("不变")) {
                             outMeter = apsProcessOperationOutMaterDo.getMetal();
                             apsProcessOperationOutMaterDo1.setMetal(outMeter);
                         }
                         String outMetalstate = apsProcessOperationOutMaterDo1.getMetalstate();
-                        if (StringUtils.isBlank(outMetalstate)) {
+                        if (apsProcessOperationOutMaterDo1.getMetalstaterule().equals("不变")) {
                             outMetalstate = apsProcessOperationOutMaterDo.getMetalstate();
                             apsProcessOperationOutMaterDo1.setMetalstate(outMetalstate);
                         }
+
                         BigDecimal tval = changeSize(apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo1.getThickrule(), apsProcessOperationOutMaterDo1.getThickchange());
                         apsProcessOperationOutMaterDo1.setThickness(tval);
                         BigDecimal wval = changeSize(apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo1.getWidthrule(), apsProcessOperationOutMaterDo1.getWidthchange());