|
@@ -171,7 +171,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
/**
|
|
/**
|
|
* 需求变更:小卷开工类型取消开工时,应该在当前工序作业明细的加工中批次号应该减去“{批次号}”
|
|
* 需求变更:小卷开工类型取消开工时,应该在当前工序作业明细的加工中批次号应该减去“{批次号}”
|
|
*/
|
|
*/
|
|
- if (ObjectUtil.isNotEmpty(recordsDo.getBatchnumber())) {
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(recordsDo.getBatchnumber()) && ObjectUtil.isNotEmpty(apsProcessOperationProcessEquDo.getDoingbatchnumber())) {
|
|
List<String> doingBatchNumbers = new LinkedList<>(Arrays.asList(apsProcessOperationProcessEquDo.getDoingbatchnumber().split(",")));
|
|
List<String> doingBatchNumbers = new LinkedList<>(Arrays.asList(apsProcessOperationProcessEquDo.getDoingbatchnumber().split(",")));
|
|
if (ObjectUtil.isNotEmpty(doingBatchNumbers)) {
|
|
if (ObjectUtil.isNotEmpty(doingBatchNumbers)) {
|
|
doingBatchNumbers.removeAll(batchNumberList);
|
|
doingBatchNumbers.removeAll(batchNumberList);
|