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_ClassTimePrjController.cs | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.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_ClassTimePrjController.cs"
similarity index 89%
rename from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.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_ClassTimePrjController.cs"
index 452f17b..7a4b223 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.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_ClassTimePrjController.cs"
@@ -25,8 +25,8 @@
public DataSet ds = new DataSet();
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DAL.ClsGy_ClassTimePrj_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrj_View();
+ DAL.ClsGy_ClassTimePrj_Ctl oBill = new DAL.ClsGy_ClassTimePrj_Ctl();
+ DAL.ClsGy_ClassTimePrj_View oBillHlp = new DAL.ClsGy_ClassTimePrj_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,25 +365,25 @@
msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
List<Model.ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrj_Model>>(msg2);
- oClassTimePrj.oModel.HItemID = list[0].HItemID;
- oClassTimePrj.oModel.HNumber = list[0].HNumber;
- oClassTimePrj.oModel.HName = list[0].HName;
- oClassTimePrj.oModel.HParentID = list[0].HParentID;
- 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.HParentID = list[0].HParentID;
+ 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;
//淇濆瓨鍓嶅垽鏂�
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
+ if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -392,7 +392,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;
@@ -405,7 +405,7 @@
if (OperationType == "1")
{
//鏂板
- if (oClassTimePrj.AddNew())
+ if (oBill.AddNew())
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -424,7 +424,7 @@
}
else
{
- if(oClassTimePrj.oModel.HCheckEmp!="")
+ if(oBill.oModel.HCheckEmp!="")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -433,7 +433,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