From e9a84a2ca945afa4693306045bc244973ebe9835 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 13 三月 2026 13:44:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/LMESController.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 1d1d394..87c44d2 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -871,19 +871,8 @@
if (hSourceID == "0" || hMoldID == "0")
{
continue;
- }
- string sReturn = "";
- if (oSystemParameter.ShowBill(ref sReturn) == true)
- {
- if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
- {
- oCN.RunProc("update Sc_ProcessExchangeBillMain set HMakeDate = GETDATE(),HRemark3='宸叉淳宸�',HMaker='" + msg4 + "' where HInterID = " + hSourceInterID);
- LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...");
-
- //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
- ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + hSourceInterID + "," + 3772, "h_p_OA_WorkLinkBill_Create");
- }
- }
+ }
+ //鏇存柊娴佽浆鍗″瓙琛ㄧ敓浜ц祫婧�
oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + hSourceID + " where HInterID=" + hSourceInterID + " and HEntryID=" + hSourceEntryID);
// 鎻掑叆鐢熶骇鐘舵�佷复鏃惰〃
string SQL = $"exec h_p_Sc_ICMOBillStatus_Tmp_PGPL {hSourceInterID},{hSourceEntryID},{hSourceID},{hMoldID}";
@@ -891,6 +880,19 @@
//鎻掑叆宸ュ簭娴佽浆鍗℃淳宸ュ崟
string SQL1 = $"exec h_p_Sc_ProcExchSendWorkBill_PG {hSourceInterID},{hSourceEntryID},{hSourceID},{hMoldID}";
oCN.RunProc(SQL1);
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ oCN.RunProc("update Sc_ProcessExchangeBillMain set HMakeDate = GETDATE(),HRemark3='宸叉淳宸�',HMaker='" + msg4 + "' where HInterID = " + hSourceInterID);
+ LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...");
+
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + hSourceInterID + "," + 3772, "h_p_OA_WorkLinkBill_Create");
+ }
+ }
+
// 7. 鎻愪氦浜嬪姟
oCN.Commit();
--
Gitblit v1.9.1