From d9946a47f871c4a34ca3d96292d13fdcc6ca997c Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Sun, 9 Oct 2022 17:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=95=86=E5=BC=80=E6=88=B7=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=94=80=E5=94=AE=E9=80=9A?=
 =?UTF-8?q?=E8=B7=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basemanufacturerbank/BaseManufacturerBank.java  | 4 ++++
 .../api/basemanufacturerbank/BaseManufacturerBankDto.java    | 4 ++++
 .../api/basemanufacturerbank/BaseManufacturerBankVo.java     | 4 ++++
 .../base/biz/basemanufacturer/BaseManufacturerMapper.xml     | 1 +
 .../biz/basemanufacturerbank/BaseManufacturerBankMapper.xml  | 5 ++++-
 5 files changed, 17 insertions(+), 1 deletion(-)

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}
     </select>
 
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