From 15316f51a5e129c2ebcf8dabff4ac30c1ee1dc32 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 17 三月 2025 19:22:23 +0800
Subject: [PATCH] 提料报表添加供应商过滤

---
 WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs |   79 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs b/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs
index 6b2c4d5..2d8d573 100644
--- a/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs
@@ -12,19 +12,51 @@
         public string HOldNumber;
         public Model.ClsGy_EnvironmentTestItem_Model oModel = new Model.ClsGy_EnvironmentTestItem_Model();
         //鏂板
-        public override bool AddNew()
+        public bool AddNew(ref string sReturn)
         {
-            //
             try
             {
                 oCn.BeginTran();
+
+
+                //淇濆瓨鍓嶆帶鍒�=========================================
+                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_EnvironmentTestItem_BeforeSaveCtrl " + oModel.HMakeEmp + ",1 ", "h_p_Gy_EnvironmentTestItem_BeforeSaveCtrl");
+                if (ds == null)
+                {
+                    sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+                    return false;
+                }
+                //=========================================================
+
                 oCn.RunProc("Insert into " + MvarItemKey + " " +
                     " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
                     " 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 + "')", 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.HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+                //=========================淇濆瓨鍚庢帶鍒�  
+                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_EnvironmentTestItem_AfterSaveCtrl " + oModel.HMakeEmp + ",1", "h_p_Gy_EnvironmentTestItem_AfterSaveCtrl");
+                if (ds2 == null)
+                {
+                    sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+                    oCn.RollBack();
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HRemark"]);
+                    oCn.RollBack();
+                    return false;
+                }
+                //============================
+
                 oCn.Commit();
                 return true;
             }
@@ -36,19 +68,36 @@
         }
 
         //淇敼
-        public override bool ModifyByID(Int64 sItemID)
+        public bool ModifyByID(Int64 sItemID, ref string sReturn)
         {
             try
             {
                 
                 oCn.BeginTran();
+
+                //淇濆瓨鍓嶆帶鍒�=========================================
+                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_EnvironmentTestItem_BeforeSaveCtrl " + oModel.HMakeEmp + ",1 ", "h_p_Gy_EnvironmentTestItem_BeforeSaveCtrl");
+                if (ds == null)
+                {
+                    sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+                    return false;
+                }
+                //=========================================================
+
+
                 oCn.RunProc("Update " + MvarItemKey + " set " +
                     " HNumber='" + oModel.HNumber + "'" +
                     ",HName='" + oModel.HName + "'" +
                     ",HShortNumber='" + oModel.HShortNumber + "'" +
                     ",HHelpCode='" + oModel.HHelpCode + "'" +
-                    ",HModifyTime='" + DateTime.Now + "'" +   
-                    ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+                    ",HModifyTime='" + DateTime.Now + "'" +
+                     ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+                    ",HCREATEORGID='" + oModel.HCREATEORGID + "'" +
                     ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
                     ",HUseFlag='" + oModel.HUseFlag + "'" +
                     ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
@@ -57,7 +106,23 @@
                 oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", 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_EnvironmentTestItem_AfterSaveCtrl " + oModel.HMakeEmp + ",1", "h_p_Gy_EnvironmentTestItem_AfterSaveCtrl");
+                if (ds2 == null)
+                {
+                    sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+                    oCn.RollBack();
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HRemark"]);
+                    oCn.RollBack();
+                    return false;
+                }
+                //============================
+
                 oCn.Commit();
                 return true;
             }

--
Gitblit v1.9.1