From ab7af2ade81540e13f747006c9735125afe66bf5 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 30 Mar 2026 11:10:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E5=8D=95=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E5=92=8C=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsDeliveryWaybillDetailVo 中新增物品名称、规格、材质等属性
- 添加厂家、表面处理描述、镀层等原材料/产品相关信息
- 在 Mapper 中增加原材料和产品的关联查询逻辑
- 实现原材料和产品表的左连接查询支持
- 添加状态描述字段用于显示库存状态信息
- 完善 Excel 导出功能中的新字段映射配置
---
 .../domain/vo/WmsDeliveryWaybillDetailVo.java | 39 +++++++++++++++++++
 .../klp/WmsDeliveryWaybillDetailMapper.xml    | 19 +++++++++
 2 files changed, 58 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
index d91881e0..2098a579 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
@@ -217,4 +217,43 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
      */
     private Date planDate;
 
+    // ==================== 原材料/产品信息 ====================
+    /**
+     * 物品名称（原材料/产品）
+     */
+    private String itemName;
+
+    /**
+     * 物品规格（原材料/产品）
+     */
+    private String itemSpecification;
+
+    /**
+     * 物品材质（原材料/产品）
+     */
+    private String itemMaterial;
+
+    /**
+     * 厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 表面处理描述
+     */
+    @ExcelProperty(value = "表面处理")
+    private String itemSurfaceTreatmentDesc;
+
+    /**
+     * 镀层
+     */
+    @ExcelProperty(value = "镀层")
+    private String itemZincLayer;
+
+    /**
+     * 状态描述
+     */
+    @ExcelProperty(value = "状态")
+    private String statusDesc;
+
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
index 78db57a6..927560ad 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
@@ -174,6 +174,14 @@
         <result property="planId" column="plan_id"/>
         <result property="planName" column="plan_name"/>
         <result property="planDate" column="plan_date"/>
+
+        <!-- 原材料/产品信息 -->
+        <result property="itemName" column="item_name"/>
+        <result property="itemSpecification" column="item_specification"/>
+        <result property="itemMaterial" column="item_material"/>
+        <result property="manufacturer" column="item_manufacturer"/>
+        <result property="itemSurfaceTreatmentDesc" column="item_surface_treatment_desc"/>
+        <result property="itemZincLayer" column="item_zinc_layer"/>
     </resultMap>
 
     <select id="selectDetailVoList" resultMap="WmsDeliveryWaybillDetailVoResult">
@@ -183,6 +191,14 @@
             c.enter_coil_no,
             c.current_coil_no,
             aw.actual_warehouse_name,
+            (CASE c.status WHEN 0 THEN '在库' WHEN 1 THEN '在途' WHEN 2 THEN '已出库' ELSE CAST(c.status AS CHAR) END) AS status_desc,
+
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.raw_material_name WHEN c.item_type = 'product' THEN pdt.product_name ELSE NULL END) AS item_name,
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.specification WHEN c.item_type = 'product' THEN pdt.specification ELSE NULL END) AS item_specification,
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.material WHEN c.item_type = 'product' THEN pdt.material ELSE NULL END) AS item_material,
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.manufacturer WHEN c.item_type = 'product' THEN pdt.manufacturer ELSE NULL END) AS item_manufacturer,
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.surface_treatment_desc WHEN c.item_type = 'product' THEN pdt.surface_treatment_desc ELSE NULL END) AS item_surface_treatment_desc,
+            (CASE WHEN c.item_type = 'raw_material' THEN rm.zinc_layer WHEN c.item_type = 'product' THEN pdt.zinc_layer ELSE NULL END) AS item_zinc_layer,
 
             w.waybill_no,
             w.waybill_name,
@@ -203,6 +219,8 @@
         FROM wms_delivery_waybill_detail d
         LEFT JOIN wms_material_coil c ON c.coil_id = d.coil_id AND c.del_flag = 0
         LEFT JOIN wms_actual_warehouse aw ON aw.actual_warehouse_id = c.actual_warehouse_id AND aw.del_flag = 0
+        LEFT JOIN wms_raw_material rm ON c.item_type = 'raw_material' AND c.item_id = rm.raw_material_id AND rm.del_flag = 0
+        LEFT JOIN wms_product pdt ON c.item_type = 'product' AND c.item_id = pdt.product_id AND pdt.del_flag = 0
         LEFT JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
         LEFT JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
         WHERE d.del_flag = 0
@@ -247,4 +265,5 @@
         </if>
     </select>
 
+
 </mapper>

From cb9998e0c47c6c11ea08bde689cd1cf2f10e74b1 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 30 Mar 2026 12:57:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsCoilAbnormal 实体类中新增 productionLine 字段
- 在 WmsCoilAbnormalBo 中添加 productionLine 查询条件字段
- 更新数据库映射文件 WmsCoilAbnormalMapper.xml 映射关系
- 在服务层实现类中添加产线名称查询过滤逻辑
- 在 WmsCoilAbnormalVo 视图对象中添加产线名称导出支持
---
 klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java   | 6 ++++++
 .../src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java  | 5 +++++
 .../src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java  | 6 ++++++
 .../com/klp/service/impl/WmsCoilAbnormalServiceImpl.java    | 1 +
 .../src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml | 1 +
 5 files changed, 19 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java
index a69659a9..99c881f3 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java
@@ -31,6 +31,12 @@ public class WmsCoilAbnormal extends BaseEntity {
      * 钢卷ID
      */
     private Long coilId;
+
+    /**
+     * 产线名称
+     */
+    private String productionLine;
+
     /**
      * 位置（上下，操作侧，中间，驱动侧）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java
index 99aeddae..bd89b4de 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java
@@ -30,6 +30,11 @@ public class WmsCoilAbnormalBo extends BaseEntity {
      */
     private Long coilId;
 
+    /**
+     * 产线名称
+     */
+    private String productionLine;
+
     /**
      * 位置（上下，操作侧，中间，驱动侧）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java
index 89f3598d..21d916c4 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java
@@ -34,6 +34,12 @@ public class WmsCoilAbnormalVo {
     @ExcelProperty(value = "钢卷ID")
     private Long coilId;
 
+    /**
+     * 产线名称
+     */
+    @ExcelProperty(value = "产线名称")
+    private String productionLine;
+
     /**
      * 位置（上下，操作侧，中间，驱动侧）
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java
index 768fe09a..c499aa45 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java
@@ -64,6 +64,7 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsCoilAbnormal> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsCoilAbnormal::getProductionLine, bo.getProductionLine());
         lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition());
         lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength());
         lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition());
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml
index 0803a5e2..6624c911 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="com.klp.domain.WmsCoilAbnormal" id="WmsCoilAbnormalResult">
         <result property="abnormalId" column="abnormal_id"/>
         <result property="coilId" column="coil_id"/>
+        <result property="productionLine" column="production_line"/>
         <result property="position" column="position"/>
         <result property="length" column="length"/>
         <result property="startPosition" column="start_position"/>

From e553bfcb22acbe83e1ed94d1659667c3b065ac3b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 30 Mar 2026 12:57:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=BA=B3=E7=A8=8E=E4=BA=BA=E8=AF=86=E5=88=AB=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CrmCustomer 实体类中新增 taxNumber 字段
- 在 CrmCustomerBo 业务对象中添加 taxNumber 属性
- 在 CrmCustomerVo 视图对象中增加 taxNumber 并配置 Excel 导出
- 更新 MyBatis 映射文件 CrmCustomerMapper.xml 添加字段映射
- 在查询条件构建中加入纳税人识别号的过滤逻辑
---
 klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java   | 4 ++++
 .../src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java  | 5 +++++
 .../src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java  | 6 ++++++
 .../com/klp/crm/service/impl/CrmCustomerServiceImpl.java    | 1 +
 klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml     | 1 +
 5 files changed, 17 insertions(+)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java
index db9f9406..a454373b 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java
@@ -56,6 +56,10 @@ public class CrmCustomer extends BaseEntity {
      * 银行信息（多条，需权限查看，JSON格式存储）
      */
     private String bankInfo;
+    /**
+     * 纳税人识别号/税号
+     */
+    private String taxNumber;
     /**
      * 备注
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java
index d06c74a2..c6b9e179 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java
@@ -62,6 +62,11 @@ public class CrmCustomerBo extends BaseEntity {
      */
     private String bankInfo;
 
+    /**
+     * 纳税人识别号/税号
+     */
+    private String taxNumber;
+
     /**
      * 备注
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java
index f5353085..5b83f607 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java
@@ -78,6 +78,12 @@ public class CrmCustomerVo {
     @ExcelDictFormat(readConverterExp = "多=条，需权限查看，JSON格式存储")
     private String bankInfo;
 
+    /**
+     * 纳税人识别号/税号
+     */
+    @ExcelProperty(value = "纳税人识别号/税号")
+    private String taxNumber;
+
     /**
      * 备注
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java
index f02841bd..f87ca7c1 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java
@@ -69,6 +69,7 @@ public class CrmCustomerServiceImpl implements ICrmCustomerService {
         lqw.eq(StringUtils.isNotBlank(bo.getCustomerLevel()), CrmCustomer::getCustomerLevel, bo.getCustomerLevel());
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), CrmCustomer::getAddress, bo.getAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getBankInfo()), CrmCustomer::getBankInfo, bo.getBankInfo());
+        lqw.eq(StringUtils.isNotBlank(bo.getTaxNumber()), CrmCustomer::getTaxNumber, bo.getTaxNumber());
         return lqw;
     }
 
diff --git a/klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml b/klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml
index f3e8f5f7..0d7f9832 100644
--- a/klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="customerLevel" column="customer_level"/>
         <result property="address" column="address"/>
         <result property="bankInfo" column="bank_info"/>
+        <result property="taxNumber" column="tax_number"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>