From cb53926b8f36c4e036d7065c6992a4c7a7da3cce Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期二, 14 十一月 2023 11:06:24 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
index 5779e44..5d28711 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
@@ -48,12 +48,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 鍗曟嵁鍙� ", "h_v_Sc_ICMOChangeBillList_Query");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 鍗曟嵁鍙� desc", "h_v_Sc_ICMOChangeBillList_Query");
}
else
{
string sql1 = "select * from h_v_Sc_ICMOChangeBillList_Query where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOChangeBillList_Query");
}
@@ -468,9 +468,46 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ //妫�楠屽瓙琛ㄦ暟鎹�
+ string errorMessage = "";
+ foreach (Model.ClsSc_ICMOChangeBillSub oSub in oBill.DetailColl)
+ {
+ //鍒ゆ柇鏂版暟閲忔槸鍚﹀皬浜庡崟鎹叧鑱旀暟閲�
+ if (oSub.HQty_New < oSub.HRelationQty)
+ {
+ errorMessage += "鐗╂枡鏂版暟閲忓皬浜庡崟鎹鍏宠仈鏁伴噺!";
+ }
+ }
+ if (errorMessage != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + errorMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦�
+ string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
+ ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏁版嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ //鍙嶅啓婧愬崟鏁版嵁
+ oCN.BeginTran();
+ sql = "exec h_p_Sc_ICMOBill_ReWriteByICMOChangeBill " + oBill.omodel.HInterID;
+ oCN.RunProc(sql);
+ oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛";
--
Gitblit v1.9.1