From 1a94e0e270668ef1cfbcd5043b72bc6591a50706 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 07 八月 2025 15:18:46 +0800
Subject: [PATCH] 价目表新增审核按钮无效修理bug
---
WebAPI/Controllers/基础资料/基础资料/Gy_PatrolCheckBillController.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs"
index 5bc9ca0..eeaa22f 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs"
@@ -232,7 +232,7 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
string HModifyEmp = msg3;
- string HPatrolCheckType = list[0].HPatrolCheckType;
+ string HPatrolCheckItemType = list[0].HPatrolCheckItemType;
bool HEndFlag = list[0].HEndFlag;
Int64 HPatrolCheckItemClassID = list[0].HPatrolCheckItemClassID;
@@ -268,7 +268,16 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ DataSet ds1 = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckList where 宸℃椤圭洰浠ｇ爜 = " + HNumber, "h_v_Gy_PatrolCheckList");
+ if(ds1.Tables[0].Rows.Count > 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_BeforeSaveCtrl");
@@ -302,7 +311,7 @@
",HUSEORGID=" + HUSEORGID +
",HHelpCode='" + HHelpCode + "'" +
",HStopflag='" + HStopflag + "'" +
- ",HPatrolCheckType='" + HPatrolCheckType + "'" +
+ ",HPatrolCheckItemType='" + HPatrolCheckItemType + "'" +
",HPatrolCheckItemClassID=" + HPatrolCheckItemClassID +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
@@ -380,7 +389,7 @@
string HUseFlag = list[0].HUseFlag;
string HMakeEmp = list[0].HMakeEmp;
bool HEndFlag = list[0].HEndFlag;
- string HPatrolCheckType = list[0].HPatrolCheckType;
+ string HPatrolCheckItemType = list[0].HPatrolCheckItemType;
Int64 HPatrolCheckItemClassID = list[0].HPatrolCheckItemClassID;
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log("Gy_PatrolCheck_Edit", 1, false, msg3))
@@ -406,6 +415,16 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+ DataSet ds1 = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckList where 宸℃椤圭洰浠ｇ爜 = " + HNumber, "h_v_Gy_PatrolCheckList");
+ if(ds1.Tables[0].Rows.Count > 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_BeforeSaveCtrl");
if (ds == null)
@@ -432,11 +451,11 @@
oCN.RunProc("Insert into Gy_PatrolCheck " +
" (HNumber,HName,HHelpCode,HShortNumber" +
",HLevel,HEndFlag,HStopflag,HRemark,HParentID,HPatrolCheckItemClassID" +
- ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID,HUseFlag,HPatrolCheckType" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID,HUseFlag,HPatrolCheckItemType" +
" ) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
+HLevel + ",1," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0," + HPatrolCheckItemClassID + "" +
- ",'" + HMakeEmp + "',getdate()," + HUSEORGID + "," + HCREATEORGID + ",'" + HUseFlag + "','"+ HPatrolCheckType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HMakeEmp + "',getdate()," + HUSEORGID + "," + HCREATEORGID + ",'" + HUseFlag + "','"+ HPatrolCheckItemType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1