aps-在制品生成规则小卷特殊处理

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -1202,10 +1202,14 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             if (ObjectUtil.isNotEmpty(apsReportOutputDos)) {
                 //如果主表的批次号不为空，查找 在制品库存中是否有此 批次号 的数据，有 复制并删除原数据，坯料批次号 等坯料数据不变，其余数据变更
                 if (ObjectUtil.isNotEmpty(apsReportRecordsDo.getBatchnumber())) {
-                    ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = apsWorkInProgressInventoryService.getOne(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda().eq(ApsWorkInProgressInventoryDo::getDeleted, "0").eq(ApsWorkInProgressInventoryDo::getBatchnumber, apsReportRecordsDo.getBatchnumber()));
+
+                    List<ApsWorkInProgressInventoryDo> apsWorkInProgressInventoryDos = apsWorkInProgressInventoryService.list(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                            .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
+                            .in(ApsWorkInProgressInventoryDo::getBatchnumber, Arrays.asList(apsReportRecordsDo.getBatchnumber().split(","))));
+                    ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = apsWorkInProgressInventoryDos.get(0);
                     //不为空，则删除数据（逻辑删除）
-                    if (ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDo)) {
-                        apsWorkInProgressInventoryService.removeById(apsWorkInProgressInventoryDo.getId());
+                    if (ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDos)) {
+                        apsWorkInProgressInventoryService.removeByIds(apsWorkInProgressInventoryDos.stream().map(ApsWorkInProgressInventoryDo::getId).collect(Collectors.toList()));
                     }
                     //增加或者复制在制品库存
                     addOrCopyWorkInProgress(apsReportOutputDos,