From d586211dd69b25e73593576b1a36616a2ae294b7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 三月 2025 19:15:52 +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