From 423aba77acc96d0ce850cd0d9c55d3ad2a37cf56 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 三月 2025 15:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsGy_Source_Ctl.cs | 148 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 114 insertions(+), 34 deletions(-)
diff --git a/WebAPI/DLL/ClsGy_Source_Ctl.cs b/WebAPI/DLL/ClsGy_Source_Ctl.cs
index ec919b1..34911b4 100644
--- a/WebAPI/DLL/ClsGy_Source_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Source_Ctl.cs
@@ -5,31 +5,66 @@
namespace DAL
{
- public class ClsGy_Source_Ctl:DBUtility.ClsGy_Base_Ctl
+ public class ClsGy_Source_Ctl : DBUtility.ClsGy_Base_Ctl
{
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
public string HOldNumber;
public Model.ClsGy_Source_Model oModel = new Model.ClsGy_Source_Model();
//鏂板
- public override bool AddNew()
+ public bool AddNew(ref string sReturn)
{
try
{
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_Source_BeforeSaveCtrl " + oModel.HMakeEmp + ",1 ", "h_p_Gy_Source_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" +
",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
- ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID)" +
+ ",HLevel,HEndFlag,HStopflag,HUseFlag,HRemark,HProcID,HOverTimes " +
+ ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID," +
+ "HUSEORGID,HCREATEORGID,HMacAddr,HEmpID,HMakeEmp,HMakeTime,HCubicleQty,HProdLinePeopleNum)" +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
- "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
- ",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
- "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ","+ oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HUseFlag +
+ "','" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
+ "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," +
+ "" + oModel.HUSEORGID + "," + oModel.HCREATEORGID + ",'" + oModel.HMacAddr + "'," + oModel.HEmpID + ",'" + oModel.HMakeEmp + "',getdate()," + oModel.HCubicleQty + "," + oModel.HProdLinePeopleNum + ")", 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_Source_AfterSaveCtrl " + oModel.HMakeEmp + ",1", "h_p_Gy_Source_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;
}
@@ -41,39 +76,84 @@
}
//淇敼
- 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_Source_BeforeSaveCtrl " + oModel.HMakeEmp + ",2 ", "h_p_Gy_Source_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 + "'" +
- ",HLevel=" + oModel.HLevel.ToString() +
- ",HParentID=" + oModel.HParentID.ToString() +
- ",HProcID=" + oModel.HProcID.ToString() +
- ",HEquipFileID_K3=" + oModel.HEquipFileID_K3.ToString() +
- ",HRelationID=" + oModel.HRelationID.ToString() +
- ",HCenterID=" + oModel.HCenterID.ToString() +
- ",HType='" + oModel.HType + "'" +
- ",HOverTimes=" + oModel.HOverTimes +
- ",HWorkTimes=" + oModel.HWorkTimes +
- ",HMaxWorkTimes=" + oModel.HMaxWorkTimes +
- ",HMinAdd=" + oModel.HMinAdd +
- ",HClassCount=" + oModel.HClassCount.ToString() +
- ",HGroupID=" + oModel.HGroupID.ToString() +
- ",HGroupK3ID=" + oModel.HGroupK3ID.ToString() +
- ",HDeptID=" + oModel.HDeptID.ToString() +
- ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
- ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
- ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HUseFlag='" + oModel.HUseFlag + "'" +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HProcID=" + oModel.HProcID.ToString() +
+ ",HEquipFileID_K3=" + oModel.HEquipFileID_K3.ToString() +
+ ",HRelationID=" + oModel.HRelationID.ToString() +
+ ",HCenterID=" + oModel.HCenterID.ToString() +
+ ",HType='" + oModel.HType + "'" +
+ ",HEmpID='" + oModel.HEmpID + "'" +
+ ",HOverTimes=" + oModel.HOverTimes +
+ ",HWorkTimes=" + oModel.HWorkTimes +
+ ",HMaxWorkTimes=" + oModel.HMaxWorkTimes +
+ ",HMinAdd=" + oModel.HMinAdd +
+ ",HClassCount=" + oModel.HClassCount.ToString() +
+ ",HGroupID=" + oModel.HGroupID.ToString() +
+ ",HGroupK3ID=" + oModel.HGroupK3ID.ToString() +
+ ",HDeptID=" + oModel.HDeptID.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HMacAddr='" + oModel.HMacAddr.ToString() + "'" +
+ ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+ ",HCREATEORGID='" + oModel.HCREATEORGID + "'" +
+ ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HCubicleQty=" + oModel.HCubicleQty +
+ ",HProdLinePeopleNum=" + oModel.HProdLinePeopleNum +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
//淇敼瀛愰」鐩唬鐮�
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_Source_AfterSaveCtrl " + oModel.HMakeEmp + ",2", "h_p_Gy_Source_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;
}
@@ -94,7 +174,7 @@
return false;
else
{
- oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
return true;
}
}
@@ -109,6 +189,6 @@
MvarItemKey = "Gy_Source";
MvarReportTitle = "鐢熶骇璧勬簮璁剧疆";
oModel = new Model.ClsGy_Source_Model();
- }
+ }
}
}
--
Gitblit v1.9.1