|
|
@@ -209,6 +209,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
//输入物料ID对应前道工序作业输出物料只有一个后道工序作业），则不可编辑，自动计算=计划输入卷数
|
|
|
if (apsCraftRouteStepDoList1.size() == 1) {
|
|
|
apsProcessOperationDo.setPlanprocessrall(processVo.get(0).getPlanprocessrall());
|
|
|
+ } else {
|
|
|
+ apsProcessOperationDo.setPlanprocessrall(0);
|
|
|
}
|
|
|
apsProcessOperationDo.setUnfinishroll(planInRall);
|
|
|
apsProcessOperationDo.setBlankid(blanckdata.getStr("ID"));
|
|
|
@@ -258,7 +260,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
apsProcessOperationOutMaterDo.setRipcutnum(1);
|
|
|
apsProcessOperationOutMaterDo.setCrosscutnum(1);
|
|
|
apsProcessOperationOutMaterDo.setOutval(1);
|
|
|
- apsProcessOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
|
|
|
+ apsProcessOperationOutMaterDo.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall());
|
|
|
//输入物料的输入单卷重*该输出物料的宽度/输入物料的宽度/该输出物料的横切分卷数
|
|
|
// 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));
|
|
|
@@ -643,7 +645,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
apsProcessOperationOutMaterDo1.setProwidth(wval);
|
|
|
BigDecimal lval = changeSize(apsProcessOperationOutMaterDo.getProlength(), apsProcessOperationOutMaterDo1.getLengthrule(), apsProcessOperationOutMaterDo1.getLengthchange());
|
|
|
apsProcessOperationOutMaterDo1.setProlength(lval);
|
|
|
- apsProcessOperationOutMaterDo1.setPlanrollnum(planinrall * apsProcessOperationOutMaterDo1.getOutval());
|
|
|
+// apsProcessOperationOutMaterDo1.setPlanrollnum(planinrall * apsProcessOperationOutMaterDo1.getOutval());
|
|
|
+ apsProcessOperationOutMaterDo1.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall());
|
|
|
//输入物料的输入单卷重*该输出物料的宽度/输入物料的宽度/该输出物料的横切分卷数
|
|
|
// String singlerollweight = df.format(apsProcessOperationOutMaterDo.getSinglerollweight().multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(apsProcessOperationOutMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationOutMaterDo.getProwidth(), 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(apsProcessOperationOutMaterDo1.getCrosscutnum().toString()), 2, BigDecimal.ROUND_HALF_UP));
|
|
|
// apsProcessOperationOutMaterDo1.setSinglerollweight(new BigDecimal(singlerollweight));
|
DLC