diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBank.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBank.java index 45c881ac5e..1ed816e2df 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBank.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBank.java @@ -67,4 +67,8 @@ public class BaseManufacturerBank extends BaseEntity { @ApiModelProperty("描述") private String remarks; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("厂家销售通路Key") + private String actualPayKey; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankDto.java index 06a90fd5ab..80c4f48ffb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankDto.java @@ -75,4 +75,8 @@ public class BaseManufacturerBankDto implements Dto { @ApiModelProperty("描述") private String remarks; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("厂家销售通路Key") + private String actualPayKey; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java index fbe6425a4f..2bc9e02f2f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java @@ -61,4 +61,8 @@ public class BaseManufacturerBankVo implements Vo { @ApiModelProperty(value = "描述") private String remarks; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("厂家销售通路Key") + private String actualPayKey; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index 29c811f1f6..3d53f3051d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -153,6 +153,7 @@ manufacturerName FROM base_manufacturer WHERE supplierType = "0004" + AND isDelete=0 AND createOrg = #{orgSid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 27614bdb52..f79c276acc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -52,7 +52,10 @@ bmb.paymentLines, bmb.swiftCode, - bmb.remarks + bmb.remarks, + /*厂家销售通路*/ + bmb.actualPay, + bmb.actualPayKey FROM base_manufacturer_bank bmb WHERE bmb.manufacturerSid = #{sid} AND bmb.isDelete = 0