From 49398e0ba948312570fa25d97eeae792468cb903 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 23 一月 2024 14:45:23 +0800
Subject: [PATCH] 保存，修改，删除 生产汇报单时，反写关联状态，关联数量
---
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index 7c45745..0b83ee1 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -38,23 +38,23 @@
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
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");
}
@@ -360,7 +360,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勬敹娆惧崟锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -469,17 +469,60 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ oCN.BeginTran();
+
+ //璁板綍杩斿洖淇℃伅
+ string msg = "";
+
+ if(oBill.omodel.HMainSourceInterID != 0)
+ {
+ //妫�楠屾簮鍗曟槸鍚﹀瓨鍦ㄥ強鍗曟嵁鐘舵��
+ string sql = "select * from Xs_ExceptiveCheckRequestBillMain where HInterID = " + oBill.omodel.HMainSourceInterID;
+ ds = oCN.RunProcReturn(sql, "Xs_ExceptiveCheckRequestBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟-鐗规壒鐢宠鍗曚笉瀛樺湪!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟-鐗规壒鐢宠鍗曟湭澶勪簬宸插鏍哥姸鎬�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if( oBill.omodel.HRelSumMoney*oBill.omodel.HExRate < double.Parse( ds.Tables[0].Rows[0]["HLeftMoney"].ToString() ))
+ {
+ msg = "鏀舵鍗曟姌鎵ｅ悗閲戦灏忎簬婧愬崟-鐗规壒鐢宠鍗曠殑娆犵己閲戦锛屾棤娉曞叧闂簮鍗�-鐗规壒鐢宠鍗�!";
+ }
+ else
+ {
+ //鍙嶅啓婧愬崟-鐗规壒鐢宠鍗曞崟鎹姸鎬�
+ sql = "update Xs_ExceptiveCheckRequestBillMain set HBillStatus = 3 where HInterID = " + oBill.omodel.HMainSourceInterID;
+ oCN.RunProc(sql);
+ }
+ }
+
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg;
objJsonResult.data = null;
return objJsonResult;
}
else
{
+ oCN.RollBack();
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -489,6 +532,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)
{
@@ -511,6 +565,8 @@
}
catch (Exception e)
{
+ oCN.RollBack();
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
@@ -802,7 +858,7 @@
}
#endregion
- #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴�
+ #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴枫�佸鎴蜂俊鐢ㄩ搴�
[Route("YS_ReceiveBill/getCustomerByCusID")]
[HttpGet]
public object getCustomerByCusID(long HCusID)
@@ -822,10 +878,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