diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
index 046a1881..c929864d 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
@@ -167,6 +167,19 @@ public class CommodityController {
if(StringUtils.isBlank(commodityCodeEntity.getZxbm())||"000000000000000000".equals(commodityCodeEntity.getZxbm())){
commodityCodeEntity.setZxbm(commodityCodeEntity.getId());
}
+ if(StringUtils.isBlank(commodityCodeEntity.getGgxh())){
+ commodityCodeEntity.setGgxh("");
+ }
+ if(StringUtils.isBlank(commodityCodeEntity.getXmdw())){
+ commodityCodeEntity.setXmdw("");
+ }
+ if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){
+ commodityCodeEntity.setXmdj("");
+ }
+ if(StringUtils.isBlank(commodityCodeEntity.getInvoiceName())){
+ commodityCodeEntity.setInvoiceName("");
+ }
+
/**
* 添加校验
*/
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
index a38dacc6..318791fd 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
@@ -266,13 +266,13 @@
tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
-
+
specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR},
-
+
metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
-
+
unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR},
@@ -356,7 +356,7 @@
tswl = #{commodityCode.tswl,jdbcType=VARCHAR},
-
+
invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR},