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

@@ -3230,6 +3230,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             actualWarehouseService.updateByBo(releaseBo);
         }
 
+        // 将被删除的合卷钢卷的二维码设置为失效
+        if (currentCoil.getQrcodeRecordId() != null) {
+            WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
+            deleteQrBo.setRecordId(currentCoil.getQrcodeRecordId());
+            deleteQrBo.setStatus(0); // 0=失效
+            generateRecordService.updateByBo(deleteQrBo);
+        }
+
         // 删除当前合卷钢卷
         baseMapper.deleteById(currentCoil.getCoilId());
 
@@ -3348,6 +3356,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 releaseBo.setIsEnabled(1);
                 actualWarehouseService.updateByBo(releaseBo);
             }
+            // 将被删除的子钢卷的二维码设置为失效
+            if (childCoil.getQrcodeRecordId() != null) {
+                WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
+                deleteQrBo.setRecordId(childCoil.getQrcodeRecordId());
+                deleteQrBo.setStatus(0); // 0=失效
+                generateRecordService.updateByBo(deleteQrBo);
+            }
             baseMapper.deleteById(childCoil.getCoilId());
         }
 
@@ -3453,7 +3468,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             actualWarehouseService.updateByBo(releaseBo);
         }
 
-        // 2. 删除当前钢卷
+        // 2. 将被删除的当前钢卷的二维码设置为失效
+        if (currentCoil.getQrcodeRecordId() != null) {
+            WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
+            deleteQrBo.setRecordId(currentCoil.getQrcodeRecordId());
+            deleteQrBo.setStatus(0); // 0=失效
+            generateRecordService.updateByBo(deleteQrBo);
+        }
+
+        // 3. 删除当前钢卷
         baseMapper.deleteById(currentCoil.getCoilId());
 
         // 3. 删除操作记录