From 63fc13d046c10532f2c9c436beb997426a703f26 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 14 十一月 2023 17:51:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index 77bab9f..1356bfe 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");
}
@@ -312,6 +312,8 @@
{
try
{
+ string s = "";
+
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBill_Drop", 1, false, user))
{
@@ -328,6 +330,24 @@
objJsonResult.count = 0;
objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
return objJsonResult;
}
@@ -782,7 +802,7 @@
}
#endregion
- #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴�
+ #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴枫�佸鎴蜂俊鐢ㄩ搴�
[Route("YS_ReceiveBill/getCustomerByCusID")]
[HttpGet]
public object getCustomerByCusID(long HCusID)
@@ -802,10 +822,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