From 0b8efdbce56a9df6eb2ec48dbc75b433e8c14256 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:04:11 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 1101998..34ec2f5 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1728,14 +1728,19 @@
                 //淇濆瓨
                 //淇濆瓨瀹屾瘯鍚庡鐞�
                 bool bResult = false;
+                string RetHInterID = "0";
                 if (oBill.omodel.HInterID == 0)
                 {
 
                     bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-
+                    if(bResult)
+                    {
+                        RetHInterID = DBUtility.ClsPub.sExeReturnInfo;
+                    }
                 }
-                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
-                if (ds.Tables[0].Rows.Count == 0)
+                // ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain nolock where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
+                //if (ds.Tables[0].Rows.Count == 0)
+                if(RetHInterID == "0")
                 {
                     oCN.RollBack();
                     objJsonResult.code = "0";
@@ -1744,12 +1749,12 @@
                     objJsonResult.data = 1;
                     return objJsonResult;
                 }
-
                 string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
                 if (sAutoCheck == "Y")
                 {
+                    LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...3 " + sAutoCheck);
 
-                    if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
+                    if (!oBill.CheckBill(long.Parse(RetHInterID), ref DBUtility.ClsPub.sExeReturnInfo))
                     {
                         oCN.RollBack();
                         objJsonResult.code = "0";
@@ -1763,9 +1768,10 @@
                 string sReturn = "";
                 if (oSystemParameter.ShowBill(ref sReturn) == true)
                 {
+                    LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...4 ");
                     if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
                     {                       
-                        LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
+                        LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
 
                         //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
                         ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");

--
Gitblit v1.9.1