From 3994537b689c934352e6e4737cfcb2dbf20b6aa1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 19 五月 2025 16:05:13 +0800
Subject: [PATCH] 报工保存条件更改
---
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 1d6cba6..a6522b0 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -736,6 +736,7 @@
long HWHID = list[0].HWHID; //鑹搧浠撳簱
string HMakeEmp = user;
string HPayMentType = list[0].HPayMentType; //璁′欢宸ヨ祫绫诲瀷
+ decimal HStandardWages = list[0].HStandardWages; //鏍囧噯宸ヤ环
//鍒ゆ柇鏉冮檺
@@ -770,6 +771,18 @@
if (HItemID == 0)
{
oCN.BeginTran();
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Process where HNumber='" + HNumber + "'", "Gy_Process");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count!=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Process_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Process_BeforeSaveCtrl");
@@ -801,14 +814,15 @@
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
",HUSEORGID,HCREATEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag" +
- ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HPayMentType,HMakeTime,HMakeEmp) " +
+ ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HPayMentType,HMakeTime,HMakeEmp,HStandardWages) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() + "','" + HUseFlag.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCodeForBase + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
"," + HUSEORGID + "," + HCREATEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + "," + HQCSchemeID_Fst + "," + HQCSchemeID_Proc + "," + HQCSchemeID_Patrol
- + ",'" + HPayMentType + "',getdate(),'" + HMakeEmp + "'" + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ + ",'" + HPayMentType + "',getdate(),'" + HMakeEmp + "'," + HStandardWages + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -843,7 +857,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Process where HItemID=" + HItemID, "Gy_Process");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "" )
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Process_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Process_BeforeSaveCtrl");
@@ -878,7 +903,7 @@
",HTypeCount= '" + HTypeCount + "'" +
",HDeptNumber='" + HDeptNumber + "'" +
",HSNo= " + HSNo +
- ",HUseFlag= " + HUseFlag +
+ ",HUseFlag= '" + HUseFlag + "'" +
",HLevel= " + HLevel +
",HEndFlag= '" + HEndFlag + "'" +
",HTProcessFlag= '" + HTProcessFlag + "'" +
@@ -905,6 +930,7 @@
",HQCSchemeID_Proc= " + HQCSchemeID_Proc +
",HQCSchemeID_Patrol= " + HQCSchemeID_Patrol +
",HPayMentType= '" + HPayMentType + "'" +
+ ",HStandardWages= " + HStandardWages +
",HModifyTime= getdate()" +
",HModifyEmp='" + HMakeEmp + "'" +
",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1