From 0e63b6a9fc9d9d4c07244edeb54233bbccacae24 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 13 十一月 2023 09:22:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
index e404a26..a3a7f83 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
@@ -487,8 +487,7 @@
return objJsonResult;
}
- //鍙嶅啓婧愬崟鏁版嵁
- oCN.BeginTran();
+ //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦�
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)
@@ -499,12 +498,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- sql = "update Sc_ICMOBillSub set HQty = " + oBill.DetailColl[0].HQty_New + " where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
- oCN.RunProc(sql);
-
+
//瀹℃牳鎻愪氦
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";
--
Gitblit v1.9.1