diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 0cd56817..a03c5fcb 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2691,6 +2691,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { } } } + // 执行第二步操作之前要判断一下参与合卷的钢卷是否有重复,相同的钢卷不能进行合卷操作 + Set coilIdSet = new HashSet<>(); + for (WmsMaterialCoilBo originalCoilBo : bo.getNewCoils()) { + if (originalCoilBo.getCoilId() == null) { + continue; + } + if (!coilIdSet.add(originalCoilBo.getCoilId())) { + throw new RuntimeException("参与合卷的钢卷中存在重复,相同的钢卷不能进行合卷操作"); + } + } // 第二步:执行合卷操作 Boolean batchResult = updateByBatch(bo);