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"
+
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"
+