From 5c6a3c4981344d9b10455d900f54a9ca44b93f26 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 5 Mar 2026 09:35:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(WmsMaterialCoilService):=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E5=BA=93=E5=8C=BA=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除库区ID比较条件，仅检查新库区ID是否为空
- 更新实际库区启用状态的方法调用逻辑
- 添加关于退货操作的详细注释说明
- 优化代码可读性和维护性
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 35309896..e156a30f 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
@@ -1199,8 +1199,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 updateQrcodeContentForNormalUpdate(oldCoil, bo, newCoil.getCoilId());
             }
 
-            // 只有当新的库区ID不为空且与原库区ID不同时才更新库区状态
-            if (bo.getActualWarehouseId() != null && !bo.getActualWarehouseId().equals(oldCoil.getActualWarehouseId())) {
+            // 只有当新的库区ID不为空时更新库区状态
+            if (bo.getActualWarehouseId() != null) {
                 updateActualWarehouseEnableStatus(oldCoil.getActualWarehouseId(), bo.getActualWarehouseId());
             }
         }
@@ -3101,7 +3101,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                     result.put("operationType", "SPLIT");
                     return result;
                 }
-
+                // 这里不写新增是因为还有退货操作,但是也和新增一样可以回滚所以直接找new_coil_id即可
                 // 如果找到普通更新操作
                 Object newCoilIdObj = step.get("new_coil_id");
                 if (newCoilIdObj != null && newCoilIdObj.toString().equals(currentCoilId.toString())) {