From de69397da6e261cd809d05104c1df002edd0b3e6 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 16 Dec 2025 14:13:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E9=92=A2?=
=?UTF-8?q?=E5=8D=B7=E6=95=B0=E6=8D=AE=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 WmsDeliveryPlanMapper.xml 中增加 action_status = 2 的过滤条件
- 修正 WmsMaterialCoilServiceImpl.java 中 dataType 的设置逻辑，
当传入值为 10 时保留原值，否则默认设为 1
---
.../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 6 +++++-
.../src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
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 b57c7ec2..7205ac1f 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
@@ -745,7 +745,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 3. 插入钢卷数据
WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
- add.setDataType(1); // 新增的钢卷默认为当前数据
+ if(bo.getDataType() == 10){
+ add.setDataType(10);
+ }else {
+ add.setDataType(1); // 新增的钢卷默认为当前数据
+ }
validEntityBeforeSave(add);
int rows = baseMapper.insert(add);
if (rows <= 0) {
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
index 2d485c78..7e8bfeb6 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
@@ -153,6 +153,7 @@
LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0
WHERE wcpa.del_flag = 0
AND wcpa.action_type = 401
+ AND wcpa.action_status = 2
AND wcpa.create_time >= #{startTime}
@@ -185,6 +186,7 @@
LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0
WHERE wcpa.del_flag = 0
AND wcpa.action_type = 401
+ AND wcpa.action_status = 2
AND wcpa.create_time >= #{startTime}