From b82fd1f99e3a3fc5d56c1930c33a08989571f9ac Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 16 七月 2025 19:31:17 +0800
Subject: [PATCH] 修复下模单 删除报错
---
WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
index 3349773..b4e7994 100644
--- a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
@@ -12,19 +12,57 @@
public string HOldNumber;
public Model.ClsGy_InspectInstruMent_Model oModel = new Model.ClsGy_InspectInstruMent_Model();
//鏂板
- public override bool AddNew()
+ public bool AddNew(ref string sExeReturnInfo)
{
//
try
{
oCn.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_InspectInstruMent_BeforeSaveCtrl " + oModel.HMakeEmp + ",'1'", "h_p_Gy_InspectInstruMent_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HERPItemID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HERPItemID" +
+ ",HCalibrationStatus,HCalibrationDate,HValidDate,HExpiryDay) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
- "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "','" + 0 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "','" + 0 + "'" +
+ ",'" + oModel.HCalibrationStatus.ToString() + "','" + oModel.HCalibrationDate.ToString() + "','" + oModel.HValidDate.ToString() + "','" + oModel.HExpiryDay.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_InspectInstruMent_AfterSaveCtrl " + oModel.HMakeEmp + ",'1'", "h_p_Gy_InspectInstruMent_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.Commit();
return true;
}
@@ -36,12 +74,29 @@
}
//淇敼
- public override bool ModifyByID(Int64 sItemID)
+ public bool ModifyByID(Int64 sItemID, ref string sExeReturnInfo)
{
try
{
oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_InspectInstruMent_BeforeSaveCtrl " + oModel.HMakeEmp + ",'1'", "h_p_Gy_InspectInstruMent_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.RunProc("Update " + MvarItemKey + " set " +
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
@@ -51,6 +106,10 @@
",HUSEORGID='" + oModel.HUSEORGID + "'" +
",HModifyEmp ='" + oModel.HMakeEmp + "'" +
",HUseFlag='" + oModel.HUseFlag + "'" +
+ ",HCalibrationStatus='" + oModel.HCalibrationStatus + "'" +
+ ",HCalibrationDate='" + oModel.HCalibrationDate + "'" +
+ ",HValidDate='" + oModel.HValidDate + "'" +
+ ",HExpiryDay='" + oModel.HExpiryDay + "'" +
",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
@@ -58,6 +117,23 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_InspectInstruMent_AfterSaveCtrl " + oModel.HMakeEmp + ",'1'", "h_p_Gy_InspectInstruMent_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sExeReturnInfo = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.Commit();
return true;
}
--
Gitblit v1.9.1