Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java

@@ -2104,6 +2104,18 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 }
             }
         }
+        // 删除钢卷的时候要把钢卷对应的二维码状态改成 0 表示二维码失效
+        if (coilList != null) {
+            for (WmsMaterialCoil coil : coilList) {
+                if (coil.getQrcodeRecordId() != null) {
+                    WmsGenerateRecordBo qrBo = new WmsGenerateRecordBo();
+                    qrBo.setRecordId(coil.getQrcodeRecordId());
+                    qrBo.setStatus(0); // 0=失效
+                    generateRecordService.updateByBo(qrBo);
+                }
+            }
+        }
+
 
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -2691,6 +2703,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 }
             }
         }
+        // 执行第二步操作之前要判断一下参与合卷的钢卷是否有重复，相同的钢卷不能进行合卷操作
+        Set<Long> 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);