From 0283686d119c5cc686d84dccb7f20a3bc50b38e0 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 11 Aug 2025 14:46:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsProduct):=20=E6=B7=BB=E5=8A=A0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsProduct 类中添加 type 字段，用于存储产品类型
- 在 WmsProductBo 和 WmsProductVo 中添加相应的 type 属性
- 更新 WmsProductMapper.xml，添加 type 字段的映射
- 在 WmsProductServiceImpl 中添加对 type 字段的查询条件
---
 klp-wms/src/main/java/com/klp/domain/WmsProduct.java        | 6 +++++-
 klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java   | 2 ++
 klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java   | 3 +++
 .../java/com/klp/service/impl/WmsProductServiceImpl.java    | 1 +
 klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml  | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
index 5146520d..51a9c3e2 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
@@ -82,11 +82,15 @@ public class WmsProduct extends BaseEntity {
      * 备注
      */
     private String remark;
-    
+
     /**
      * BOM 表头ID
      */
     private Long bomId;
+    /**
+     * 类型
+     */
+    private String type;
 
 }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
index 491b88a7..6a7c84b6 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
@@ -91,5 +91,7 @@ public class WmsProductBo extends BaseEntity {
      * BOM 表头ID
      */
     private Long bomId;
+    //产品类型
+    private String type;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
index 7e00822e..ad2db09f 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
@@ -113,5 +113,8 @@ public class WmsProductVo {
     @ExcelProperty(value = "BOM 表头ID")
     private Long bomId;
 
+    @ExcelProperty(value = "类型")
+    private String type;
+
 }
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
index 410ca855..d39a4127 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
@@ -77,6 +77,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
         lqw.eq(bo.getInnerDiameter() != null, WmsProduct::getInnerDiameter, bo.getInnerDiameter());
         lqw.eq(bo.getIsEnabled() != null, WmsProduct::getIsEnabled, bo.getIsEnabled());
         lqw.eq(bo.getBomId() != null, WmsProduct::getBomId, bo.getBomId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), WmsProduct::getType, bo.getType());
         return lqw;
     }
 
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
index eb2c0107..25ce423c 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit" column="unit"/>
         <result property="remark" column="remark"/>
         <result property="bomId" column="bom_id"/>
+        <result property="type" column="type"/>
     </resultMap>