From 14ae0e21c8660dbb3ac20a5b0d9db9b6dde3cfb9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 25 三月 2026 17:07:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 1256f2b..6f7e31f 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1038,14 +1038,14 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
+ objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
objJsonResult.data = null;
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+ objJsonResult.Message = "宸ュ崟鏈鐞�,鍏佽鎿嶄綔锛�";
objJsonResult.data = null;
}
@@ -1631,6 +1631,8 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
int sYear = 0;
@@ -1662,7 +1664,17 @@
ClsSc_MESBeginWorkBillMain.HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
ClsSc_MESBeginWorkBillMain.HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
ClsSc_MESBeginWorkBillMain.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+ ClsSc_MESBeginWorkBillMain.HProcExchInterID = int.Parse(ds.Tables[0].Rows[0]["HProcExchInterID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HProcExchEntryID = int.Parse(ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
+ ClsSc_MESBeginWorkBillMain.HPeopleSum = 1;
+ //鑾峰彇鐝
+ DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + int.Parse(ds.Tables[0].Rows[0]["HDeptID"].ToString()) + "," + int.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString()), "h_p_Gy_GetWorkShiftInfo");
+ if (set.Tables[0].Rows.Count > 0)
+ {
+ 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");
//if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
@@ -1710,6 +1722,7 @@
}
oCN.BeginTran();
+ DataSet ds2 = null;
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult = false;
@@ -1719,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")
@@ -1745,8 +1758,29 @@
}
}
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
+
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");
+ }
+ }
+
oCN.Commit();
+ if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
+ {
+ int HInterID = int.Parse(ds2.Tables[0].Rows[0]["NewHInterID"].ToString());
+ LogService.Write("鎵ц娑堟伅鎺ㄩ��..." + HInterID);
+
+ // 瑙﹀彂娑堟伅鎺ㄩ��
+ Service.GeTuiService.PubishSingle(HInterID);
+ }
+
if (bResult)
{
--
Gitblit v1.9.1