From 254f71374c74cb9782ff85db0e39cf64d38c7ce2 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 11 三月 2026 14:24:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index d9a752e..8d605b1 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1631,6 +1631,34 @@
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;
+ }
+ }
+
+
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
int sYear = 0;
--
Gitblit v1.9.1