From 20d2ab1725550e465db4c73499e1b864ccf3179d Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 16 Jan 2026 11:17:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E8=A7=A3=E5=86=B3=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E9=92=A2=E5=8D=B7=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 ServiceException 导入用于异常处理
- 增加历史数据校验逻辑，防止历史数据钢卷被发货
- 当检测到历史数据时抛出运行时异常并提示相应信息
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java     | 5 +++++
 1 file changed, 5 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 ecb2bf92..5673312d 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
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.klp.common.exception.ServiceException;
 import com.klp.common.helper.LoginHelper;
 import com.klp.common.utils.StringUtils;
 import com.klp.common.utils.spring.SpringUtils;
@@ -2225,6 +2226,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         WmsMaterialCoilVo wmsMaterialCoilVo = queryById(coilId);
         Long oldActualWarehouseId = wmsMaterialCoilVo != null ? wmsMaterialCoilVo.getActualWarehouseId() : null;
 
+        // 如果当前钢卷为历史数据应该抛异常
+        if (wmsMaterialCoilVo != null && wmsMaterialCoilVo.getDataType() == 0) {
+            throw new RuntimeException("当前数据为历史数据，请勿发货！");
+        }
         // 1. 更新钢卷为已发货，并记录发货时间，同时清空实际库区占用（改用Wrapper实现）
         int rows = 0;
         //获取当前调用接口的这个人的username