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 |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
index 7640ef2..b4e7994 100644
--- a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
@@ -12,12 +12,30 @@
         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" +
@@ -27,6 +45,24 @@
                     ",'" + 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;
             }
@@ -38,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 + "'" +
@@ -64,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