From 566311664a715df456139fc6b389ef39116d30d8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 三月 2026 16:07:58 +0800
Subject: [PATCH] 添加开工接口，委外同步工序流转卡
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 50 ++++++++++++--------------------------------------
1 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 8d605b1..6f7e31f 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1631,32 +1631,6 @@
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;
- }
- }
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
@@ -1758,16 +1732,16 @@
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
- ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
- if (ds.Tables[0].Rows.Count == 0)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鍗曟嵁!";
- objJsonResult.data = 1;
- return objJsonResult;
- }
+ //ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
+ //if (ds.Tables[0].Rows.Count == 0)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏌ユ棤鍗曟嵁!";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
if (sAutoCheck == "Y")
@@ -1789,10 +1763,10 @@
{
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