From 4d9c473a0bd2ac6128b09b7609b072a33c70bd62 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 28 十一月 2023 09:42:25 +0800
Subject: [PATCH] 取消根据用户关联客户过滤
---
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index 7c45745..6fde40b 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -49,12 +49,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillList_Query order by 鍗曟嵁鍙� ", "h_v_YS_ReceiveBillList_Query");
+ ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillList_Query order by 鍗曟嵁鍙� desc", "h_v_YS_ReceiveBillList_Query");
}
else
{
string sql1 = "select * from h_v_YS_ReceiveBillList_Query where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
ds = oCN.RunProcReturn(sql, "h_v_YS_ReceiveBillList_Query");
}
@@ -489,6 +489,17 @@
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
+ string sql = "exec h_p_YS_ReceiveBill_AbandonCheckCrediControl " + oBill.omodel.HInterID;
+ ds = oCN.RunProcReturn(sql, "h_p_YS_ReceiveBill_AbandonCheckCrediControl");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅鏍告彁浜bandonCheck
if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
@@ -802,7 +813,7 @@
}
#endregion
- #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴�
+ #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴枫�佸鎴蜂俊鐢ㄩ搴�
[Route("YS_ReceiveBill/getCustomerByCusID")]
[HttpGet]
public object getCustomerByCusID(long HCusID)
@@ -822,10 +833,12 @@
,ISNULL(b.HItemID,0) HBankID
,b.HName HBankName
,c.HBankAccount
+ ,ISNULL(cre.HCreditRating_Now,0) HCreditRating_Now
from Gy_Customer as c
left join Gy_SettleStyle as s on c.HSSID = s.HItemID
left join Gy_Currency as cur on c.HCurID = cur.HItemID
left join Gy_Bank as b on c.HBank = b.HName
+ left join Gy_Customer_Credit as cre on c.HItemID = cre.HCusID
where c.HItemID = " + HCusID;
ds = oCN.RunProcReturn(sql, "Gy_Customer");
--
Gitblit v1.9.1