Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@@ -95,6 +95,11 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("审核结果")
     private String confirmDetail;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -27,7 +27,9 @@
                depositBank,
                accountSid,
                procInstSid     as procInsId,
-               nodeSid         as taskId
+               nodeSid         as taskId,
+               purchaseSystemName,
+               purchaseSystemSid
         FROM bus_deposit
         WHERE billSid = #{virtualOrderSid}
     </select>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@@ -63,5 +63,10 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     @JsonProperty("collectionBillId")
     private String billNo;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java

@@ -24,5 +24,8 @@ public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query {
     @ApiModelProperty("机构sid")
     private String orgPath;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -99,7 +99,9 @@
                remarks,
                payAccount,
                receivingName,
-               billNo
+               billNo,
+               purchaseSystemSid,
+               purchaseSystemName
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1168,6 +1168,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (vinNoList.size() > 0) {
             qw.notIn("VIN", vinNoList);
         }
+        if(StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())){
+            qw.eq("purchaseSystemSid",pagerQuery.getParams().getPurchaseSystemSid());
+        }
         IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java

@@ -89,4 +89,9 @@ public class DepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("财务审核结果")
     private String confirmDetail;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java

@@ -53,5 +53,10 @@ public class ConfirmationDetailedVo implements Vo {
     @ApiModelProperty("单据编号")
     @JsonProperty("collectionBillId")
     private String billNo;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@@ -84,4 +84,9 @@ public class ConfirmationInitVo implements Vo {
     @ApiModelProperty("单据编号")
     @JsonProperty("collectionBillId")
     private String billNo;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }