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