作业优化

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

@@ -1534,7 +1534,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         BigDecimal lval = changeSize(apsProcessOperationOutMaterDo.getProlength(), apsProcessOperationOutMaterDo1.getLengthrule(), apsProcessOperationOutMaterDo1.getLengthchange(), apsProcessOperationOutMaterDo1.getProlength());
                         apsProcessOperationOutMaterDo1.setProlength(lval);
                         apsProcessOperationOutMaterDo1.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall() * apsProcessOperationOutMaterDo1.getOutval());
-                        if (apsProcessOperationOutMaterDoList1.size() == 1 && apsProcessOperationOutMaterDo1.getOutval() == 1) {
+                        if (apsProcessOperationOutMaterDoList1.size() == 1) {
                             //输入单卷重*输出宽度/输入宽度
                             String singlerollweight = df.format(apsProcessOperationOutMaterDo.getSinglerollweight().multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(apsProcessOperationOutMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationOutMaterDo.getProwidth(), 3, BigDecimal.ROUND_HALF_UP));
                             apsProcessOperationOutMaterDo1.setSinglerollweight(new BigDecimal(singlerollweight));
@@ -1870,7 +1870,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
             apsProcessOperationOutMaterDo.setProlength(lval);
             apsProcessOperationOutMaterDo.setPlanrollnum(rollnum);
-            if (apsProcessOperationOutMaterDos.size() == 1 && apsProcessOperationOutMaterDo.getOutval() == 1) {
+            if (apsProcessOperationOutMaterDos.size() == 1) {
                 //输入单卷重*输出宽度/输入宽度
                 String outsinglerollweight = df.format(singlerollweight.multiply(apsProcessOperationOutMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationOutMaterDo.getProwidth()).divide(apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth(), 3, BigDecimal.ROUND_HALF_UP));
                 apsProcessOperationOutMaterDo.setSinglerollweight(new BigDecimal(outsinglerollweight));