|
|
@@ -224,7 +224,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
apsProcessOperationOutMaterDo.setOutval(1);
|
|
|
apsProcessOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
|
|
|
//输入物料的输入单卷重*该输出物料的宽度/输入物料的宽度/该输出物料的单卷输出数量
|
|
|
- String singlerollweight = df.format(outMaterDo.getSinglerollweight().multiply(wval).divide(outMaterDo.getProwidth(), 2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ String singlerollweight = df.format(outMaterDo.getSinglerollweight().multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(outMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : outMaterDo.getProwidth(), 2, BigDecimal.ROUND_HALF_UP));
|
|
|
apsProcessOperationOutMaterDo.setSinglerollweight(new BigDecimal(singlerollweight));
|
|
|
apsProcessOperationOutMaterDo.setNumunit(blanckdata.getStr("NUMBERUNIT"));
|
|
|
apsProcessOperationOutMaterDo.setPlanstockrollnum(0);
|
|
|
@@ -349,7 +349,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
apsProcessOperationOutMaterDo.setOutval(1);
|
|
|
apsProcessOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
|
|
|
//输入物料的输入单卷重*该输出物料的宽度/输入物料的宽度/该输出物料的单卷输出数量
|
|
|
- String singlerollweight = df.format(blanckdata.getBigDecimal("SINGLEROLLWEIGHT").multiply(wval).divide(blanckdata.getBigDecimal("PROWIDTH"), 2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ String singlerollweight = df.format(blanckdata.getBigDecimal("SINGLEROLLWEIGHT").multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(blanckdata.getBigDecimal("PROWIDTH") == null ? BigDecimal.valueOf(1) : blanckdata.getBigDecimal("PROWIDTH"), 2, BigDecimal.ROUND_HALF_UP));
|
|
|
apsProcessOperationOutMaterDo.setSinglerollweight(new BigDecimal(singlerollweight));
|
|
|
apsProcessOperationOutMaterDo.setNumunit(blanckdata.getStr("NUMBERUNIT"));
|
|
|
apsProcessOperationOutMaterDo.setPlanstockrollnum(0);
|
|
|
@@ -419,7 +419,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
|
|
|
boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
|
|
|
boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoList);
|
|
|
- boolean bool3 = apsProcessOperationEquService.saveOrUpdateBatch(apsProcessOperationEquDoList);
|
|
|
+ boolean bool3 = true;
|
|
|
+ if (apsProcessOperationEquDoList.size() > 0) {
|
|
|
+ bool3 = apsProcessOperationEquService.saveOrUpdateBatch(apsProcessOperationEquDoList);
|
|
|
+ }
|
|
|
boolean bool4 = sysMindMappingService.saveOrUpdateBatch(sysMindMappingDos);
|
|
|
|
|
|
if (bool1 && bool2 && bool3 && bool4) {
|
DLC