diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
index 36583fa0..fe68ad18 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
@@ -73,6 +73,14 @@ public class WmsMaterialCoil extends BaseEntity {
* 物品ID(指向原材料或产品主键)
*/
private Long itemId;
+ /**
+ * 毛重(kg)
+ */
+ private BigDecimal grossWeight;
+ /**
+ * 净重(kg)
+ */
+ private BigDecimal netWeight;
/**
* 状态(0=在库,1=在途,2=已出库)
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index dd94f4af..aad30dd1 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -6,6 +6,7 @@ import com.klp.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -84,6 +85,16 @@ public class WmsMaterialCoilBo extends BaseEntity {
*/
private Long itemId;
+ /**
+ * 毛重(kg)
+ */
+ private BigDecimal grossWeight;
+
+ /**
+ * 净重(kg)
+ */
+ private BigDecimal netWeight;
+
/**
* 状态(0=在库,1=在途,2=已出库)
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index fdf24891..f5ea3392 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
+import java.math.BigDecimal;
/**
@@ -99,6 +100,18 @@ public class WmsMaterialCoilVo {
@ExcelProperty(value = "物品ID")
private Long itemId;
+ /**
+ * 毛重(kg)
+ */
+ @ExcelProperty(value = "毛重(kg)")
+ private BigDecimal grossWeight;
+
+ /**
+ * 净重(kg)
+ */
+ @ExcelProperty(value = "净重(kg)")
+ private BigDecimal netWeight;
+
/**
* 状态
*/
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index df473fad..6e270622 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
diff --git a/script/sql/mysql/stock.sql b/script/sql/mysql/stock.sql
index 5d7bb9c6..4c2d2ba8 100644
--- a/script/sql/mysql/stock.sql
+++ b/script/sql/mysql/stock.sql
@@ -41,7 +41,8 @@ create table wms_material_coil
parent_coil_nos varchar(500) null comment '父卷号(合卷或分卷时用,逗号分隔)',
item_id bigint not null comment '物品ID(指向原材料或产品主键)',
item_type varchar(20) not null comment '物品类型(raw_material/product)',
- weight decimal(10,2) null comment '重量',
+ gross_weight decimal(10,2) null comment '毛重(kg)',
+ net_weight decimal(10,2) null comment '净重(kg)',
status tinyint(1) default 0 null comment '状态(0=在库,1=在途,2=已出库)',
remark varchar(255) null comment '备注',
del_flag tinyint(1) default 0 not null comment '删除标志(0=正常,1=已删除)',