From ce0366bb8db4f9665e715b8647df6eb15fa07f68 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 25 一月 2024 14:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/工资基础资料/Gy_ClassTimePrjGroupController.cs | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupController.cs"
similarity index 87%
rename from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
rename to "WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupController.cs"
index 051b596..8335e09 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupController.cs"
@@ -25,8 +25,8 @@
public DataSet ds = new DataSet();
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
- DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
+ DAL.ClsGy_ClassTimePrjGroup_Ctl oBill = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
+ DAL.ClsGy_ClassTimePrjGroup_View oBillHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
#region 鏍哥畻鏂瑰紡缁勫垪琛�
@@ -100,10 +100,10 @@
}
//鍒ゆ柇瀛樺湪鎬�
- if (oClassTimePrjHlp.GetInfoByID(HItemID))
+ if (oBillHlp.GetInfoByID(HItemID))
{
//鍒ゆ柇鏄惁瀛樺湪瀛愰」
- if (oClassTimePrj.HavChildCodes(HItemID))
+ if (oBill.HavChildCodes(HItemID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -112,10 +112,10 @@
return objJsonResult;
}
//鍒犻櫎鏁版嵁
- if (oClassTimePrj.DeleteByID(HItemID))
+ if (oBill.DeleteByID(HItemID))
{
//鍐欏叆鏃ュ織
- DBUtility.ClsPub.Add_Log("", "鍒犻櫎鏍哥畻鏂瑰紡缁勶紝浠ｇ爜锛�" + oClassTimePrjHlp.omodel.HNumber + ",鍚嶇О锛�" + oClassTimePrjHlp.omodel.HName, HMaker);
+ DBUtility.ClsPub.Add_Log("", "鍒犻櫎鏍哥畻鏂瑰紡缁勶紝浠ｇ爜锛�" + oBillHlp.omodel.HNumber + ",鍚嶇О锛�" + oBillHlp.omodel.HName, HMaker);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
@@ -178,7 +178,7 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -197,7 +197,7 @@
}
else if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
- if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -261,7 +261,7 @@
if (IsStop == 0) //绂佺敤鍒ゆ柇
{
- if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -280,7 +280,7 @@
}
else if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
{
- if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -365,36 +365,36 @@
msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
- oClassTimePrj.oModel.HItemID = list[0].HItemID;
- oClassTimePrj.oModel.HNumber = list[0].HNumber;
- oClassTimePrj.oModel.HName = list[0].HName;
- oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
- oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
- oClassTimePrj.oModel.HEndFlag = true;
- oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
- oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
- oClassTimePrj.oModel.HRemark = list[0].HRemark;
- oClassTimePrj.oModel.HMakeEmp = HMaker;
- oClassTimePrj.oModel.HModifyEmp = HMaker;
- oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
- oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
- oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
+ oBill.oModel.HItemID = list[0].HItemID;
+ oBill.oModel.HNumber = list[0].HNumber;
+ oBill.oModel.HName = list[0].HName;
+ oBill.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
+ oBill.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
+ oBill.oModel.HEndFlag = true;
+ oBill.oModel.HStopflag = list[0].HStopflag;
+ oBill.oModel.HUseFlag = list[0].HUseFlag;
+ oBill.oModel.HRemark = list[0].HRemark;
+ oBill.oModel.HMakeEmp = HMaker;
+ oBill.oModel.HModifyEmp = HMaker;
+ oBill.oModel.HCheckEmp = list[0].HCheckEmp;
+ oBill.oModel.HUSEORGID = list[0].HUSEORGID;
+ oBill.oModel.HCREATEORGID = list[0].HUSEORGID;
//
- oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
- oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
+ oBill.oModel.HDeptID = list[0].HDeptID;
+ oBill.oModel.HGroupID = list[0].HGroupID;
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
if (sParent.Trim() == "")
{
- oClassTimePrj.oModel.HParentID = 0;
+ oBill.oModel.HParentID = 0;
}
else
{
- ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
+ ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oBill.oModel.HItemID, ModRightName);
if (ds.Tables[0].Rows.Count > 0)
{
- oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
+ oBill.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
}
else
{
@@ -407,14 +407,14 @@
}
//淇濆瓨鍘熶唬鐮�
- DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
+ DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oBill.oModel.HItemID + "'", ModRightName);
if (dsOldNumber.Tables[0].Rows.Count > 0)
{
- oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
+ oBill.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
//鏄惁鏂颁唬鐮佹槸鑷繁瀛愰」鐩殑銆�瀛愰」鐩�
- if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
+ if (sParent.Length >= oBill.HOldNumber.Length)
{
- if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
+ if (sParent.Substring(0, oBill.HOldNumber.ToString().Length) == oBill.HOldNumber.Trim())
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -426,12 +426,12 @@
}
else
{
- oClassTimePrj.HOldNumber = "";
+ oBill.HOldNumber = "";
}
//淇濆瓨鍓嶅垽鏂�
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
+ if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -440,7 +440,7 @@
return objJsonResult;
}
//鏄惁閲嶅浠ｇ爜
- if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
+ if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -453,7 +453,7 @@
if (OperationType == "1")
{
//鏂板
- if (oClassTimePrj.AddNew())
+ if (oBill.AddNew())
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -472,7 +472,7 @@
}
else
{
- if(oClassTimePrj.oModel.HCheckEmp!="")
+ if(oBill.oModel.HCheckEmp!="")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -481,7 +481,7 @@
return objJsonResult;
}
//淇敼
- if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
+ if (oBill.ModifyByID(oBill.oModel.HItemID))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1