From 9354ade44152c9764ea5d10a87a219cf2e8fd691 Mon Sep 17 00:00:00 2001 From: hanxuntao Date: Sat, 12 Oct 2024 08:06:05 +0800 Subject: [PATCH] 1 --- DSWeb/Areas/Account/DAL/Chfee_bankdata/Chfee_bankdataDAL.cs | 2 +- DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DSWeb/Areas/Account/DAL/Chfee_bankdata/Chfee_bankdataDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_bankdata/Chfee_bankdataDAL.cs index 8f65e97..0e0d17b 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_bankdata/Chfee_bankdataDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_bankdata/Chfee_bankdataDAL.cs @@ -674,7 +674,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_bankdata if (Bankdata.TRANSTYPE == "来账") { - var addinvlist = ChsettlementDAL.GetRecvInvAllDataList("BILLNO in (select BILLNO FROM ch_fee_bankdata_fitdetail WHERE LINKGID='" + Bankdata.GID + "')", userid, username, companyid); + var addinvlist = ChsettlementDAL.GetRecvInvAllDataList("cm.BILLNO in (select BILLNO FROM ch_fee_bankdata_fitdetail WHERE LINKGID='" + Bankdata.GID + "')", userid, username, companyid); var head = new ChSettlement(); diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index a47a38b..d2bf4cd 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs @@ -4938,7 +4938,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement var STLINVPART = MsSysParamSetDAL.GetData("PARAMNAME='STLINVPART'"); if (STLINVPART.PARAMVALUE != "1") { - strSql.Append(" and BILLNO NOT IN (SELECT distinct BILLNO FROM ch_fee_do where EXISTS "); + strSql.Append(" and cm.BILLNO NOT IN (SELECT distinct BILLNO FROM ch_fee_do where EXISTS "); strSql.Append(" (select 1 from ch_fee f where ch_fee_do.FEEID=f.GID and f.FEESTATUS IN (0,8,9) "); strSql.Append(" and (f.SETTLEMENT<>0 or f.ORDERAMOUNT<>0 or ISNULL(f.ORDERSETTLEMENT,0)<>0) )) "); }