|
|
@@ -586,7 +586,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
public List<ApsProcessOperationOutMaterDo> resetProcessOperation(List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList) {
|
|
|
List<ApsProcessOperationOutMaterDo> operationOutMaterDos = new ArrayList<>();//递归的数据源
|
|
|
try {
|
|
|
- List<ApsProcessOperationDo> processOperationDos = apsProcessOperationDao.getProcessOperation(apsProcessOperationOutMaterDoList.get(0).getBlankid());
|
|
|
+// List<ApsProcessOperationDo> processOperationDos = apsProcessOperationDao.getProcessOperation(apsProcessOperationOutMaterDoList.get(0).getBlankid());
|
|
|
List<ApsProcessOperationDo> apsProcessOperationDoList = new ArrayList<>();
|
|
|
List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoNewList = new ArrayList<>();
|
|
|
for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDoList) {
|
|
|
@@ -608,8 +608,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
apsProcessOperationDo.setPlaninrall(planinrall);
|
|
|
//输入物料ID对应前道工序作业输出物料只有一个后道工序作业），则不可编辑，自动计算=计划输入卷数
|
|
|
if (apsProcessOperationDos.size() == 1) {
|
|
|
- ApsProcessOperationDo operationDo = processOperationDos.stream().filter(item -> item.getId().equals(apsProcessOperationDo.getPreviousprocessid())).findFirst().get();
|
|
|
- apsProcessOperationDo.setPlanprocessrall(operationDo.getPlanprocessrall());
|
|
|
+ apsProcessOperationDo.setPlanprocessrall(planinrall);
|
|
|
+// ApsProcessOperationDo operationDo = processOperationDos.stream().filter(item -> item.getId().equals(apsProcessOperationDo.getPreviousprocessid())).findFirst().get();
|
|
|
+// apsProcessOperationDo.setPlanprocessrall(operationDo.getPlanprocessrall());
|
|
|
}
|
|
|
apsProcessOperationDo.setUnfinishroll(planinrall - apsProcessOperationDo.getCheckoutroll());
|
|
|
String meterInput = getInMeterInfo(apsProcessOperationOutMaterDo.getProducttype(), apsProcessOperationOutMaterDo.getMetal(), apsProcessOperationOutMaterDo.getMetalstate(), apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getProlength());
|
DLC