From 0edeb429c606766c73f7193f9a4f21f8579a966d Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 6 Mar 2026 10:17:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=93=8D=E4=BD=9C=E7=9A=84=E5=8A=A0=E5=B7=A5=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在退货流程中增加加工日志记录逻辑
- 当老的实际库区存在时自动添加加工出库记录
- 使用operationType=2标识退货操作类型
- 记录退货操作的仓库作业日志信息
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 7 +++++++
 1 file changed, 7 insertions(+)

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 cb448324..01c5eb06 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
@@ -4247,6 +4247,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             updateQrcodeContentForReturn(oldCoil, newCoil.getCoilId());
         }
 
+        // 退货操作：记录加工日志（operationType=2）
+        // 老的实际库区存在，加一条加工出库记录
+        Long oldActualWarehouseId = oldCoil.getActualWarehouseId();
+        if (oldActualWarehouseId != null && oldActualWarehouseId != -1L) {
+            recordWarehouseOperationLog(oldCoil.getCoilId(), oldActualWarehouseId, 2, 2, "退货操作-加工出库");
+        }
+
         return queryById(newCoil.getCoilId());
     }