diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 37caab42..0e01d67b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -233,6 +233,7 @@ public class ThrProductsAddDiController { udiProductEntity.setCatalogname3(thrProductsAddDiEntity.getCatalogname3()); udiProductEntity.setMatrial(thrProductsAddDiEntity.getMatrial()); udiProductEntity.setDiType(1); + udiProductEntity.setRequireCost(thrProductsAddDiEntity.getRequireCost()); BeanUtil.copyProperties(udiProductEntity, udiRelevanceEntity); udiRelevanceEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy()); @@ -330,6 +331,7 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType()); udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType()); udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType()); + udiProductEntity.setRequireCost(thrProductsAddDiEntity.getRequireCost()); String flbm = thrProductsAddDiResponse.getFlbm(); //是否需要扫码 初始化 diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java index 2293b1b2..df1381e3 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -409,4 +409,11 @@ public class ThrProductsAddDiEntity { @TableField(value = "internalMaterialCode") @ApiModelProperty(value = "'内部物资编码'") private String internalMaterialCode; + + /** + * 是否需要收费 1是;0否 + */ + @TableField(exist = false) + private Integer requireCost; + } diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java index f3f7e374..985c350f 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java @@ -61,4 +61,6 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity { @TableField(value = "internalMaterialCode") @ApiModelProperty(value = "'内部物资编码'") private String internalMaterialCode; + + private Integer requireCost = 0; } diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index 22e8ee60..39894797 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -111,6 +111,8 @@ public class UdiInfoResponse { private String matrial; private Boolean isStack; + private Integer requireCost; + public Integer getId() { return id; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index dff52307..86a4887e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -199,6 +199,7 @@ public class ThrProductsAddDiService extends ServiceImpl().eq("hsbm", thrProductsAddDiEntity.getBasicPrductRemak8()).last("limit 1"));