From fae58e2951ccf415ad8e8098ca49f5611e410dd3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 10 四月 2026 09:35:50 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 54 ++++++++++++++++++------------------------------------
1 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 8d605b1..34ec2f5 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -465,7 +465,8 @@
/// <returns></returns>
[Route("Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom_KS")]
[HttpGet]
- public object SaveGetMESBeginWorkFrom_KS(string HBillType,int HSourceInterID,int HSourceEntryID,string HSourceBillNo,string user,string HSourceBillType)
+ public object SaveGetMESBeginWorkFrom_KS(string HBillType,int HSourceInterID,int HSourceEntryID,
+ string HSourceBillNo,string user,string HSourceBillType)
{
@@ -1618,7 +1619,8 @@
#region 鎶ュ伐骞冲彴蹇嵎寮�宸�
[Route("Sc_MESBeginWorkBill/FastBeginWorkBill")]
[HttpGet]
- public object FastBeginWorkBill(string HBillType, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, string HSourceBillType,string user)
+ public object FastBeginWorkBill(string HBillType, int HSourceInterID, int HSourceEntryID,
+ string HSourceBillNo, string HSourceBillType,string user)
{
@@ -1630,32 +1632,6 @@
objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
- }
-
- oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo);
- if(oSystemParameter.omodel.Sc_MESBeginWorkBill_FirstCheckCtl == "Y")
- {
- // 鍒ゆ柇鏄惁鍏佽 鏈妫�鍚堟牸鍓嶅紑宸�
- DataSet ds = oCN.RunProcReturn($@"select top 1 * from QC_FirstPieceCheckBillMain
- where HMainSourceBillType = '{HBillType}' and HMainSourceBillNo = '{HSourceBillNo}'
- order by HDate desc", "QC_FirstPieceCheckBillMain");
-
- if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "妫�楠岄浠舵楠屽け璐ワ紝璇ュ崟鎹病鏈夊仛瀵瑰嵃鐨勯妫�鍗�";
-
- return objJsonResult;
- }
-
- if (ds.Tables[0].Rows[0]["HLastResult"].ToString() == "0")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "棣栦欢妫�澶辫触锛岄浠舵妫�楠岀粨鏋滀负涓嶅悎鏍硷紝涓嶅厑璁镐笅鎺ㄥ崟鎹�";
- return objJsonResult;
- }
}
@@ -1701,7 +1677,7 @@
{
ClsSc_MESBeginWorkBillMain.HWorkShiftID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
}
- ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 鐢ㄦ埛鍚嶇О='" + user + "'", "h_v_xt_UserAssociationSelect");
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 鐢ㄦ埛鍚嶇О='" + user + "'", "h_v_Cj_GetDefValByUser");
//if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
//{
@@ -1752,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";
@@ -1768,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";
@@ -1787,12 +1768,13 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
+ LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...4 ");
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
- LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...");
+ LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
//鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
- ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + ds.Tables[0].Rows[0]["HInterID"].ToString() + "," + 3772, "h_p_OA_WorkLinkBill_Create");
+ ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");
}
}
--
Gitblit v1.9.1