From 803c49729613a8694f0fe49967550101b4341911 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 21 Jul 2025 13:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E4=BA=A7=E5=93=81=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E8=A1=A8=E5=8A=A0=E5=85=A5=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5,=E5=8F=98=E6=9B=B4=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=20bo=20vo=E5=92=8CresultMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-wms/src/main/java/com/klp/domain/WmsProduct.java        | 4 ++++
 klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java    | 4 ++++
 klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java   | 5 +++++
 .../src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java   | 5 +++++
 klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java   | 6 ++++++
 .../src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java   | 6 ++++++
 klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml  | 1 +
 .../src/main/resources/mapper/klp/WmsRawMaterialMapper.xml  | 1 +
 8 files changed, 32 insertions(+)

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 ace12002..42c18263 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java
@@ -65,6 +65,10 @@ public class WmsProduct extends BaseEntity {
      * 内径（mm）
      */
     private BigDecimal innerDiameter;
+    /**
+     * 单位
+     */
+    private String unit;
     /**
      * 是否启用（0=否，1=是）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java b/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java
index 463aed5b..d0945c80 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java
@@ -122,5 +122,9 @@ public class WmsRawMaterial extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 单位
+     */
+    private String unit;
 
 }
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 fdbea4e6..5f324fbf 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
@@ -85,6 +85,11 @@ public class WmsProductBo extends BaseEntity {
     @NotNull(message = "内径（mm）不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal innerDiameter;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
     /**
      * 是否启用（0=否，1=是）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java
index e3e37374..6760f3eb 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java
@@ -140,5 +140,10 @@ public class WmsRawMaterialBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
 
 }
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 3083e77c..335dbb22 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
@@ -89,6 +89,12 @@ public class WmsProductVo {
     @ExcelDictFormat(readConverterExp = "m=m")
     private BigDecimal innerDiameter;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
     /**
      * 是否启用（0=否，1=是）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
index 74b56234..47577d51 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
@@ -181,5 +181,11 @@ public class WmsRawMaterialVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
 
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
index e391dfa1..ad39c161 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="unit" column="unit"/>
     </resultMap>
 
 
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml
index 7575786a..d1af9109 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="unit" column="unit"/>
     </resultMap>