Merge remote-tracking branch 'origin/master'

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

@@ -307,11 +307,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 outMetalstate = outMaterDo.getMetalstate();
                                 apsProcessOperationOutMaterDo.setMetalstate(outMaterDo.getMetalstate());
                             }
-                            BigDecimal tval = changeSize(outMaterDo.getThickness(), apsProcessOperationOutMaterDo.getThickrule(), apsProcessOperationOutMaterDo.getThickchange());
+                            BigDecimal tval = changeSize(outMaterDo.getThickness(), apsProcessOperationOutMaterDo.getThickrule(), apsProcessOperationOutMaterDo.getThickchange(), apsProcessOperationOutMaterDo.getThickness());
                             apsProcessOperationOutMaterDo.setThickness(tval);
-                            BigDecimal wval = changeSize(outMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getWidthrule(), apsProcessOperationOutMaterDo.getWidthchange());
+                            BigDecimal wval = changeSize(outMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getWidthrule(), apsProcessOperationOutMaterDo.getWidthchange(), apsProcessOperationOutMaterDo.getProwidth());
                             apsProcessOperationOutMaterDo.setProwidth(wval);
-                            BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange());
+                            BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                             apsProcessOperationOutMaterDo.setProlength(lval);
 //                            apsProcessOperationOutMaterDo.setRipcutnum(1);
 //                            apsProcessOperationOutMaterDo.setCrosscutnum(1);
@@ -466,11 +466,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             outMetalstate = blanckdata.getStr("ALLOYSTATUS");
                             apsProcessOperationOutMaterDo.setMetalstate(blanckdata.getStr("ALLOYSTATUS"));
                         }
-                        BigDecimal tval = changeSize(blanckdata.getBigDecimal("THICKNESS"), apsProcessOperationOutMaterDo.getThickrule(), apsProcessOperationOutMaterDo.getThickchange());
+                        BigDecimal tval = changeSize(blanckdata.getBigDecimal("THICKNESS"), apsProcessOperationOutMaterDo.getThickrule(), apsProcessOperationOutMaterDo.getThickchange(), apsProcessOperationOutMaterDo.getThickness());
                         apsProcessOperationOutMaterDo.setThickness(tval);
-                        BigDecimal wval = changeSize(blanckdata.getBigDecimal("PROWIDTH"), apsProcessOperationOutMaterDo.getWidthrule(), apsProcessOperationOutMaterDo.getWidthchange());
+                        BigDecimal wval = changeSize(blanckdata.getBigDecimal("PROWIDTH"), apsProcessOperationOutMaterDo.getWidthrule(), apsProcessOperationOutMaterDo.getWidthchange(), apsProcessOperationOutMaterDo.getProwidth());
                         apsProcessOperationOutMaterDo.setProwidth(wval);
-                        BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange());
+                        BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                         apsProcessOperationOutMaterDo.setProlength(lval);
 //                        apsProcessOperationOutMaterDo.setRipcutnum(1);
 //                        apsProcessOperationOutMaterDo.setCrosscutnum(1);
@@ -847,11 +847,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo1.setMetalstate(outMetalstate);
                         }
 
-                        BigDecimal tval = changeSize(apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo1.getThickrule(), apsProcessOperationOutMaterDo1.getThickchange());
+                        BigDecimal tval = changeSize(apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo1.getThickrule(), apsProcessOperationOutMaterDo1.getThickchange(), apsProcessOperationOutMaterDo1.getThickness());
                         apsProcessOperationOutMaterDo1.setThickness(tval);
-                        BigDecimal wval = changeSize(apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo1.getWidthrule(), apsProcessOperationOutMaterDo1.getWidthchange());
+                        BigDecimal wval = changeSize(apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo1.getWidthrule(), apsProcessOperationOutMaterDo1.getWidthchange(), apsProcessOperationOutMaterDo1.getProwidth());
                         apsProcessOperationOutMaterDo1.setProwidth(wval);
-                        BigDecimal lval = changeSize(apsProcessOperationOutMaterDo.getProlength(), apsProcessOperationOutMaterDo1.getLengthrule(), apsProcessOperationOutMaterDo1.getLengthchange());
+                        BigDecimal lval = changeSize(apsProcessOperationOutMaterDo.getProlength(), apsProcessOperationOutMaterDo1.getLengthrule(), apsProcessOperationOutMaterDo1.getLengthchange(), apsProcessOperationOutMaterDo1.getProlength());
                         apsProcessOperationOutMaterDo1.setProlength(lval);
                         apsProcessOperationOutMaterDo1.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall() * apsProcessOperationOutMaterDo1.getOutval());
                         //输入单卷重*输出宽度/输入宽度
@@ -1348,7 +1348,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     /*
     长宽高的计算规则
      */
-    private BigDecimal changeSize(BigDecimal oldVal, String countRule, BigDecimal changeVal) {
+    private BigDecimal changeSize(BigDecimal oldVal, String countRule, BigDecimal changeVal, BigDecimal curVal) {
         BigDecimal newVal = null;
         if (!countRule.equals("自定义") && oldVal != null) {
             if (countRule.equals("=")) {
@@ -1361,6 +1361,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 newVal = oldVal;
             }
         }
+        if (countRule.equals("自定义")) {
+            newVal = curVal;
+        }
         return newVal;
     }
 

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

@@ -296,31 +296,41 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             //根据工序查询其工序的加工参数
             List<ApsParameterDo> parameterDoList = this.baseMapper.selectApsParameterByProcess(apsProcessOperationDo.getProcess());
             List<ApsReportMachiningDo> needInsertApsReportMachingList = new LinkedList<>();
-            for (ApsParameterDo apsParameterDo : parameterDoList) {
-                ApsReportMachiningDo apsReportMachiningDo = new ApsReportMachiningDo();
-                apsReportMachiningDo.setId(SecurityUtil.getUUID());
-                apsReportMachiningDo.setTenantid(tenantId);
-                apsReportMachiningDo.setMainid(apsReportRecordsDo.getId());
-                apsReportMachiningDo.setMatching(apsParameterDo.getParameter());
-                needInsertApsReportMachingList.add(apsReportMachiningDo);
-            }
-            if (ObjectUtil.isNotEmpty(needInsertApsReportMachingList)) {
-                apsReportMachiningService.saveBatch(needInsertApsReportMachingList);
+            if (ObjectUtil.isNotEmpty(parameterDoList)) {
+                for (ApsParameterDo apsParameterDo : parameterDoList) {
+                    if (ObjectUtil.isEmpty(apsParameterDo)) {
+                        continue;
+                    }
+                    ApsReportMachiningDo apsReportMachiningDo = new ApsReportMachiningDo();
+                    apsReportMachiningDo.setId(SecurityUtil.getUUID());
+                    apsReportMachiningDo.setTenantid(tenantId);
+                    apsReportMachiningDo.setMainid(apsReportRecordsDo.getId());
+                    apsReportMachiningDo.setMatching(apsParameterDo.getParameter());
+                    needInsertApsReportMachingList.add(apsReportMachiningDo);
+                }
+                if (ObjectUtil.isNotEmpty(needInsertApsReportMachingList)) {
+                    apsReportMachiningService.saveBatch(needInsertApsReportMachingList);
+                }
             }
 
             //根据工序查询其工序的检查项目
             List<ApsCheckParameterDo> checkParameterDoList = this.baseMapper.selectApsCheckParameterByProcess(apsProcessOperationDo.getProcess());
             List<ApsReportCheckoutDo> needInsertApsReportCheckList = new LinkedList<>();
-            for (ApsCheckParameterDo apsCheckParameterDo : checkParameterDoList) {
-                ApsReportCheckoutDo apsReportCheckoutDo = new ApsReportCheckoutDo();
-                apsReportCheckoutDo.setId(SecurityUtil.getUUID());
-                apsReportCheckoutDo.setTenantid(tenantId);
-                apsReportCheckoutDo.setMainid(apsReportRecordsDo.getId());
-                apsReportCheckoutDo.setCheckitem(apsCheckParameterDo.getCheckparameter());
-                needInsertApsReportCheckList.add(apsReportCheckoutDo);
-            }
-            if (ObjectUtil.isNotEmpty(needInsertApsReportCheckList)) {
-                apsReportCheckoutService.saveBatch(needInsertApsReportCheckList);
+            if (ObjectUtil.isNotEmpty(checkParameterDoList)) {
+                for (ApsCheckParameterDo apsCheckParameterDo : checkParameterDoList) {
+                    if (ObjectUtil.isEmpty(apsCheckParameterDo)) {
+                        continue;
+                    }
+                    ApsReportCheckoutDo apsReportCheckoutDo = new ApsReportCheckoutDo();
+                    apsReportCheckoutDo.setId(SecurityUtil.getUUID());
+                    apsReportCheckoutDo.setTenantid(tenantId);
+                    apsReportCheckoutDo.setMainid(apsReportRecordsDo.getId());
+                    apsReportCheckoutDo.setCheckitem(apsCheckParameterDo.getCheckparameter());
+                    needInsertApsReportCheckList.add(apsReportCheckoutDo);
+                }
+                if (ObjectUtil.isNotEmpty(needInsertApsReportCheckList)) {
+                    apsReportCheckoutService.saveBatch(needInsertApsReportCheckList);
+                }
             }
 
         }