|
@@ -649,15 +649,20 @@ public class ReportCheckServiceImpl implements ReportCheckService {
|
|
|
// 更新流转取消数量
|
|
|
circulationCancellation(nextProcessOperationProcessEquDos, nextProcessList, circulationCancellationMap);
|
|
|
} else {
|
|
|
- List<String> outPutNumbers = new LinkedList<>();
|
|
|
- for (String key : toBeProcessedDataMap.keySet()) {
|
|
|
- outPutNumbers.addAll(toBeProcessedDataMap.get(key));
|
|
|
+ //如果工序作业存在后道,但是明细没有后道,则变为备料
|
|
|
+ if (StringUtils.isNotBlank(currentProcessOperationDo.getNextprocessid())) {
|
|
|
+ List<String> outPutNumbers = new LinkedList<>();
|
|
|
+ for (String key : toBeProcessedDataMap.keySet()) {
|
|
|
+ outPutNumbers.addAll(toBeProcessedDataMap.get(key));
|
|
|
+ }
|
|
|
+ if (!outPutNumbers.isEmpty()) {
|
|
|
+ //没有找到后道,表示后道作业取消了,无需分配,需要转到备料库,即设置在制品状态=备料中
|
|
|
+ apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
|
|
|
+ .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "备料中")
|
|
|
+ .in(ApsWorkInProgressInventoryDo::getBatchnumber, outPutNumbers)
|
|
|
+ .eq(ApsWorkInProgressInventoryDo::getDeleted, "0"));
|
|
|
+ }
|
|
|
}
|
|
|
- //没有找到后道,表示后道作业取消了,无需分配,需要转到备料库,即设置在制品状态=备料中
|
|
|
- apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
|
|
|
- .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "备料中")
|
|
|
- .in(ApsWorkInProgressInventoryDo::getBatchnumber, outPutNumbers)
|
|
|
- .eq(ApsWorkInProgressInventoryDo::getDeleted, "0"));
|
|
|
}
|
|
|
}
|
|
|
|