From 8df2ba3888e02e82448c464791b5354b0a087920 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 25 一月 2024 10:44:38 +0800
Subject: [PATCH] 1
---
/dev/null | 373 -----------------------
WebAPI/Controllers/基础资料/工资基础资料/Gy_ClassTimePrjGroupController.cs | 78 ++--
DAL/基础资料/公用基础资料/ClsGy_WorkPayType_Ctl.cs | 18
WebAPI/Controllers/基础资料/工资基础资料/Gy_WorkTypeController.cs | 171 +++++-----
WebAPI/Controllers/项目管理/报表分析/PM_ReportController.cs | 15
DAL/基础资料/公用基础资料/ClsGy_WorkType_Ctl.cs | 29 +
WebAPI/Controllers/基础资料/工资基础资料/Gy_ClassTimePrjController.cs | 58 +-
DBUtility/基础资料/ClsGy_Base_Ctl.cs | 16 +
WebAPI/WebAPI.csproj | 10
WebAPI/Controllers/基础资料/工资基础资料/Gy_WorkPayTypeController.cs | 169 +++++-----
10 files changed, 292 insertions(+), 645 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkPayType_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkPayType_Ctl.cs"
index 3d6169d..454eaff 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkPayType_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkPayType_Ctl.cs"
@@ -20,9 +20,12 @@
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,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 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
+ ",'" + oModel.HMakeEmp + "',getdate()" + "," + oModel.HUSEORGID.ToString() + "," + oModel.HCREATEORGID.ToString() +
+ ") ", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -45,12 +48,17 @@
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID.ToString() +
",HHelpCode='" + oModel.HHelpCode + "'" +
",HLevel=" + oModel.HLevel.ToString() +
- ",HParentID=" + oModel.HParentID.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);
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HModifyEmp= '" + oModel.HModifyEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID=" + oModel.HUSEORGID.ToString() +
+ ",HCREATEORGID=" + oModel.HCREATEORGID.ToString() +
+ " where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
@@ -89,7 +97,7 @@
public ClsGy_WorkPayType_Ctl()
{
MvarItemKey = "Gy_WorkPayType";
- MvarReportTitle = "宸ヨ祫绫诲瀷璁剧疆";
+ MvarReportTitle = "宸ヨ祫绫诲瀷";
oModel = new Model.ClsGy_WorkPayType_Model();
}
}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkType_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkType_Ctl.cs"
index d7981cc..ab26879 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkType_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkType_Ctl.cs"
@@ -14,15 +14,19 @@
//鏂板
public override bool AddNew()
{
-
try
{
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
- " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + ",'" + oModel.HForEmp + "'" +
- "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HPayMoney.ToString() + "," + oModel.HDayMoney.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID" +
+ ",HPayMoney,HDayMoney,HForEmp) " +
+ " 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 + "'" +
+ ",'" + oModel.HMakeEmp + "',getdate()" + "," + oModel.HUSEORGID.ToString() + "," + oModel.HCREATEORGID.ToString() +
+ "," + oModel.HPayMoney.ToString() + "," + oModel.HDayMoney.ToString() + ",'" + oModel.HForEmp + "'" +
+ ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -45,15 +49,20 @@
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
",HShortNumber='" + oModel.HShortNumber + "'" +
- ",HForEmp='" + oModel.HForEmp + "'" +
- ",HHelpCode='" + oModel.HHelpCode + "'" +
- ",HLevel=" + oModel.HLevel.ToString() +
",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HModifyEmp= '" + oModel.HModifyEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID=" + oModel.HUSEORGID.ToString() +
+ ",HCREATEORGID=" + oModel.HCREATEORGID.ToString() +
+ //===========================================================
",HPayMoney=" + oModel.HPayMoney.ToString() +
",HDayMoney=" + oModel.HDayMoney.ToString() +
- ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HForEmp='" + oModel.HForEmp + "'" +
+ " where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
@@ -92,7 +101,7 @@
public ClsGy_WorkType_Ctl()
{
MvarItemKey = "Gy_WorkType";
- MvarReportTitle = "宸ョ璁剧疆";
+ MvarReportTitle = "宸ョ";
oModel = new Model.ClsGy_WorkType_Model();
}
}
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
index f5a0166..2f41816 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
@@ -362,6 +362,14 @@
sReturn = "鍗曟嵁宸茬鐢紝涓嶅厑璁搁噸澶嶇鐢紒";
return false;
}
+
+ DataSet DsHavChildCodes = oCn.RunProcReturn("select HItemID from " + MvarItemKey + " where HStopflag=0 and HParentID='" + HItemID + "'", MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DsHavChildCodes.Tables[0].Rows.Count > 0)
+ {
+ sReturn = "鎵�閫夊崟鎹瓨鍦ㄦ湭绂佺敤鐨勫瓙椤圭洰,涓嶅厑璁哥鐢紒";
+ return false;
+ }
+
//绂佺敤
oCn.BeginTran();
oCn.RunProc("Update " + MvarItemKey + " set HStopflag=1,HStopEmp = '" + HMaker + "',HStopTime=getdate() where HItemID=" + HItemID, ref Pub_Class.ClsPub.sExeReturnInfo);
@@ -403,6 +411,14 @@
sReturn = "鍗曟嵁鏈鐢紝涓嶅厑璁稿弽绂佺敤锛�";
return false;
}
+
+ DataSet DsHavChildCodes = oCn.RunProcReturn("select HItemID from " + MvarItemKey + " where HStopflag=1 and HItemID='" + DS.Tables[0].Rows[0]["HParentID"].ToString() + "'", MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DsHavChildCodes.Tables[0].Rows.Count > 0)
+ {
+ sReturn = "鎵�閫夊崟鎹笂绾ч」鐩凡绂佺敤,涓嶅厑璁稿弽绂佺敤锛�";
+ return false;
+ }
+
//绂佺敤
oCn.BeginTran();
oCn.RunProc("Update " + MvarItemKey + " set HStopflag=0,HStopEmp = '',HStopTime=null where HItemID=" + HItemID, ref Pub_Class.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
deleted file mode 100644
index d13893c..0000000
--- a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-锘縰sing Model;
-using Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-namespace WebAPI.Controllers
-{
- public class Gy_WorkPayTypeController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖宸ヤ綔涓績鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayType/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayType/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
-
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where HitemID=" + HInterID, "h_v_Gy_WorkPayTypeList");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
-
- ///// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Gy_WorkType/AddBill")]
- //[HttpPost]
- //public object AddBill([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
- // DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
- // DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
- // List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
- // long HItemID = list[0].HItemID ;
- // string HNumber = list[0].HNumber;
- // string HName = list[0].HName;
- // string HShortNumber = list[0].HShortNumber;
- // long HParentID = list[0].HParentID;
- // string HHelpCode = list[0].HHelpCode;
- // string HRemark = list[0].HRemark;
- // bool HStopflag = list[0].HStopflag;
- // string HForEmp = list[0].HForEmp;
- // //string HUseFlag = list[0].HUseFlag;
- // var HPayMoney = list[0].HPayMoney;
- // var HDayMoney = list[0].HDayMoney;
- // var HEndFlag = 0;
- // var HLevel = "";
- // if (!DBUtility.ClsPub.AllowNumber(HNumber))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // string sql = "Insert into Gy_WorkType " +
- // " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
- // ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
- // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
- // "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
- // oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // if (list[0].HItemID.ToString() != "")
- // {
- // oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // oCN.Commit();
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鏂板鎴愬姛锛�";
- // //objJsonResult.data = null;
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- /// <summary>
- /// 淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayType/ModifyByID")]
- [HttpPost]
- public object ModifyByID([FromBody] JObject oMain)
- {
- try
- {
- DAL.ClsGy_WorkPayType_Ctl oDept = new DAL.ClsGy_WorkPayType_Ctl();
- DAL.ClsGy_WorkPayType_View oDeptHlp = new DAL.ClsGy_WorkPayType_View();
-
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_WorkPayType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkPayType>>(msg2);
-
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HHelpCode = list[0].HHelpCode;
- string HShortNumber = "0";
- long HParentID = list[0].HParentID;
- var HLevel = list[0].HLevel;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- bool HEndFlag = list[0].HEndFlag;
- string HUseFlag = list[0].HUseFlag;
-
-
-
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_WorkPayType " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark) " +
- " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_WorkPayType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else
- {
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- oCN.RunProc("Update Gy_WorkPayType set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HHelpCode='" + HHelpCode + "'" +
- ",HLevel=" + HLevel.ToString() +
- ",HParentID=" + HParentID.ToString() +
- ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_WorkPayType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-
- oCN.Commit();
- }
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetGy_WorkPayType")]
- [HttpGet]
- public object DeltetGy_WorkPayType(string HItemID)
- {
- DataSet ds;
- DataSet ds1;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
- try
- {
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (string.IsNullOrWhiteSpace(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_WorkPayType where HItemID=" + HItemID, "Gy_WorkPayType");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_WorkPayType Where HParentID='" + HItemID + "'", " Gy_WorkPayType");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
- if (HUseFlag == "宸蹭娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- oCN.RunProc("delete from Gy_WorkPayType where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult; ;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
deleted file mode 100644
index a36240d..0000000
--- a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-锘縰sing Model;
-using Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-namespace WebAPI.Controllers
-{
- public class Gy_WorkTypeController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖宸ヤ綔涓績鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkType/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkType/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
-
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList where HitemID=" + HInterID, "h_v_Gy_WorkTypeList");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
-
- ///// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Gy_WorkType/AddBill")]
- //[HttpPost]
- //public object AddBill([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
- // DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
- // DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
- // List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
- // long HItemID = list[0].HItemID ;
- // string HNumber = list[0].HNumber;
- // string HName = list[0].HName;
- // string HShortNumber = list[0].HShortNumber;
- // long HParentID = list[0].HParentID;
- // string HHelpCode = list[0].HHelpCode;
- // string HRemark = list[0].HRemark;
- // bool HStopflag = list[0].HStopflag;
- // string HForEmp = list[0].HForEmp;
- // //string HUseFlag = list[0].HUseFlag;
- // var HPayMoney = list[0].HPayMoney;
- // var HDayMoney = list[0].HDayMoney;
- // var HEndFlag = 0;
- // var HLevel = "";
- // if (!DBUtility.ClsPub.AllowNumber(HNumber))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // string sql = "Insert into Gy_WorkType " +
- // " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
- // ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
- // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
- // "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
- // oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // if (list[0].HItemID.ToString() != "")
- // {
- // oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // oCN.Commit();
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鏂板鎴愬姛锛�";
- // //objJsonResult.data = null;
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- /// <summary>
- /// 淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkType/ModifyByID")]
- [HttpPost]
- public object ModifyByID([FromBody] JObject oMain)
- {
- try
- {
- DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
- DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
-
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg2);
-
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HHelpCode = list[0].HHelpCode;
- string HShortNumber = "0";
- long HParentID = list[0].HParentID;
- var HLevel = list[0].HLevel;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- bool HEndFlag = list[0].HEndFlag;
- string HUseFlag = list[0].HUseFlag;
- var HDayMoney = list[0].HDayMoney;
- var HPayMoney = list[0].HPayMoney;
- string HForEmp = list[0].HForEmp;
-
-
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_WorkType " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
- " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else
- {
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- oCN.RunProc("Update Gy_WorkType set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HForEmp='" + HForEmp + "'" +
- ",HHelpCode='" + HHelpCode + "'" +
- ",HLevel=" + HLevel.ToString() +
- ",HParentID=" + HParentID.ToString() +
- ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HPayMoney=" + HPayMoney.ToString() +
- ",HDayMoney=" + HDayMoney.ToString() +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-
- oCN.Commit();
- }
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetGy_WorkType")]
- [HttpGet]
- public object DeltetGy_WorkType(string HItemID)
- {
- DataSet ds;
- DataSet ds1;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
- try
- {
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (string.IsNullOrWhiteSpace(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_WorkType where HItemID=" + HItemID, "Gy_WorkType");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_WorkType Where HParentID='" + HItemID + "'", " Gy_WorkType");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
- if (HUseFlag == "宸蹭娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- oCN.RunProc("delete from Gy_WorkType where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult; ;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
deleted file mode 100644
index 230388f..0000000
--- a/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers.GZGL
-{
- public class Gy_WorkPayTypeBillController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DataSet ds = new DataSet();
- public DLL.ClsGy_WorkPayTypeBill BillNew0 = new DLL.ClsGy_WorkPayTypeBill();
- public DLL.ClsGy_WorkPayTypeBill BillOld0 = new DLL.ClsGy_WorkPayTypeBill();
-
- #region 宸ヨ祫绫诲瀷鍒楄〃鏁版嵁
- /// <summary>
- /// 杩斿洖宸ヨ祫绫诲瀷鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayTypeBill/GetWorkPayTypelist")]
- [HttpGet]
- public object GetWorkPayTypelist(string sWhere,string user)
- {
- try
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList order by 宸ヨ祫绫诲瀷浠ｇ爜 ", "h_v_Gy_WorkPayTypeList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by 宸ヨ祫绫诲瀷浠ｇ爜 ";
- ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鍒犻櫎宸ヨ祫绫诲瀷
- /// <summary>
- /// 宸ヨ祫绫诲瀷鍒楄〃鍒犻櫎鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayTypeBill/Delete_Json")]
- [HttpGet]
- public object Delete_Json(string HInterID,string user)
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType_Delete", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鐢╥d鏌ュ埌璇ュ璞�
- string sql = "select * from Gy_WorkPayType where HItemID = " + HInterID;
- ds = oCN.RunProcReturn(sql, "Gy_WorkPayType");
- if (ds == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓嶅瓨鍦ㄦ瀵硅薄锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- //if (ds.Tables[0].Columns[12].ToString()!="鏈娇鐢�")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //else
- //{
- string sql2 = "delete from Gy_WorkPayType where HItemID = " + HInterID;
- ds = oCN.RunProcReturn(sql2, "Gy_WorkPayType");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- //}
- }
- }
- #endregion
-
- #region 宸ヨ祫绫诲瀷淇敼鑾峰彇缁戝畾鏁版嵁
- /// <summary>
- /// 宸ヨ祫绫诲瀷鍒楄〃淇敼鎸夐挳鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayTypeBill/xg")]
- [HttpGet]
- public object xg(long HID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from Gy_WorkPayType where HItemID=" + HID, "Gy_WorkPayType");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 宸ヨ祫绫诲瀷淇濆瓨
- /// <summary>
- /// 淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkPayTypeBill/SaveGetGy_WorkPayTypeBill")]
- [HttpPost]
- public object SaveGetGy_WorkPayTypeBill([FromBody] JObject oMain)
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg4 = sArray[2].ToString();
-
- ListModels oListModels = new ListModels();
-
- try
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkPayType_Edit", 1, false, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- DLL.ClsGy_WorkPayTypeBill oBill = new DLL.ClsGy_WorkPayTypeBill();
- List<Model.ClsGy_WorkPayType_Model> lsmain = new List<Model.ClsGy_WorkPayType_Model>();
- msg2 = msg2.Replace("\\", "");
- msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_WorkPayTypeBill(msg2);
- foreach (Model.ClsGy_WorkPayType_Model oItem in lsmain)
- {
- oBill.omodel = oItem;
- }
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- bool bResult;
- if (oBill.omodel.HItemID == 0)
- {
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- }
- else
- {
- bResult = oBill.ModifyBill(oBill.omodel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- if (bResult)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- #endregion
- }
-}
diff --git a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
deleted file mode 100644
index af2ec3a..0000000
--- a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-锘縰sing DBUtility;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers.GZGL
-{
- public class Gy_WorkTypeBillController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DataSet ds = new DataSet();
- public DLL.ClsGy_WorkTypeBill BillNew0 = new DLL.ClsGy_WorkTypeBill();
- public DLL.ClsGy_WorkTypeBill BillOld0 = new DLL.ClsGy_WorkTypeBill();
-
- #region 宸ョ鍒楄〃鏁版嵁
- /// <summary>
- /// 杩斿洖宸ョ鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkTypeBill/GetWorkTypelist")]
- [HttpGet]
- public object GetWorkTypelist(string sWhere,string user)
- {
- try
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkType", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList order by 宸ョ浠ｇ爜", "h_v_Gy_WorkTypeList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by 宸ョ浠ｇ爜";
- ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鍒犻櫎宸ョ
- /// <summary>
- /// 宸ョ鍒楄〃鍒犻櫎鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkTypeBill/Delete_Json")]
- [HttpGet]
- public object Delete_Json(string HInterID,string user)
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkType_Delete", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- //鐢╥d鏌ュ埌璇ュ璞�
- string sql = "select * from Gy_WorkType where HItemID = "+HInterID;
- ds = oCN.RunProcReturn(sql, "Gy_WorkType");
- if (ds==null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓嶅瓨鍦ㄦ瀵硅薄锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- //if (ds.Tables[0].Columns[12].ToString()!="鏈娇鐢�")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //else
- //{
- string sql2 = "delete from Gy_WorkType where HItemID = " + HInterID;
- ds = oCN.RunProcReturn(sql2, "Gy_WorkType");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- //}
- }
- }
- #endregion
-
- #region 宸ョ淇敼鑾峰彇缁戝畾鏁版嵁
- /// <summary>
- /// 宸ョ鍒楄〃淇敼鎸夐挳鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkTypeBill/xg")]
- [HttpGet]
- public object xg(long HID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from Gy_WorkType where HItemID=" + HID, "Gy_WorkType");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 宸ョ淇濆瓨
- /// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_WorkTypeBill/SaveGetGy_WorkTypeBill")]
- [HttpPost]
- public object SaveGetGy_WorkTypeBill([FromBody] JObject oMain)
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
-
- ListModels oListModels = new ListModels();
-
- try
- {
- if (!DBUtility.ClsPub.Security_Log(msg4, 1, false, msg3))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- DLL.ClsGy_WorkTypeBill oBill = new DLL.ClsGy_WorkTypeBill();
- List<Model.ClsGy_WorkType_Model> lsmain = new List<Model.ClsGy_WorkType_Model>();
- msg2 = msg2.Replace("\\", "");
- msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_WorkTypeBill(msg2);
- foreach (Model.ClsGy_WorkType_Model oItem in lsmain)
- {
- oBill.omodel = oItem;
- }
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- bool bResult;
- if (oBill.omodel.HItemID == 0)
- {
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- }
- else
- {
- bResult = oBill.ModifyBill(oBill.omodel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- if (bResult)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- #endregion
- }
-}
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;
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;
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_WorkPayTypeController.cs"
similarity index 71%
copy from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
copy 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_WorkPayTypeController.cs"
index 051b596..4464185 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_WorkPayTypeController.cs"
@@ -12,11 +12,11 @@
namespace WebAPI.Controllers
{
- public class Gy_ClassTimePrjGroupController : ApiController
+ public class Gy_WorkPayTypeController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- const string ModCaption = "鏍哥畻鏂瑰紡缁�";
- public const string ModRightName = "Gy_ClassTimePrjGroup";
+ const string ModCaption = "宸ヨ祫绫诲瀷";
+ public const string ModRightName = "Gy_WorkPayType";
public const string ModRightNameAdd = ModRightName + "_Add"; //鏂板
public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
@@ -25,18 +25,18 @@
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_WorkPayType_Ctl oBill = new DAL.ClsGy_WorkPayType_Ctl();
+ DAL.ClsGy_WorkPayType_View oBillHlp = new DAL.ClsGy_WorkPayType_View();
- #region 鏍哥畻鏂瑰紡缁勫垪琛�
+ #region 宸ヨ祫绫诲瀷鍒楄〃
/// <summary>
- /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛ㄤ俊鎭�
+ /// 鑾峰彇宸ヨ祫绫诲瀷鍒楄〃淇℃伅
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayTypeList_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
+ public object GetGy_WorkPayTypeList_Json(string sWhere, string HMaker)
{
try
{
@@ -51,7 +51,7 @@
}
//杩斿洖鍒楄〃淇℃伅
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_ClassTimePrjGroupList");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_WorkPayTypeList");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -78,14 +78,14 @@
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫垹闄�
+ #region 宸ヨ祫绫诲瀷鍒犻櫎
/// <summary>
- /// 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// 鍒犻櫎宸ヨ祫绫诲瀷
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Delete_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
+ public object GetGy_WorkPayType_Delete_Json(Int64 HItemID, string HMaker)
{
try
{
@@ -100,25 +100,25 @@
}
//鍒ゆ柇瀛樺湪鎬�
- if (oClassTimePrjHlp.GetInfoByID(HItemID))
+ if (oBillHlp.GetInfoByID(HItemID))
{
//鍒ゆ柇鏄惁瀛樺湪瀛愰」
- if (oClassTimePrj.HavChildCodes(HItemID))
+ if (oBill.HavChildCodes(HItemID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ゆ牳绠楁柟寮忕粍瀛樺湪瀛愰」鐩�,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "姝ゅ伐璧勭被鍨嬪瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
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 = "鍒犻櫎鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -126,7 +126,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒";
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -135,7 +135,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭被鍨嬶紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -144,24 +144,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫鏍搞�佸弽瀹℃牳
+ #region 宸ヨ祫绫诲瀷瀹℃牳銆佸弽瀹℃牳
/// <summary>
- /// 瀹℃牳銆佸弽瀹℃牳鏍哥畻鏂瑰紡缁�
+ /// 瀹℃牳銆佸弽瀹℃牳宸ヨ祫绫诲瀷
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Check_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
+ public object GetGy_WorkPayType_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
{
string sErrMsg = "";
try
@@ -178,11 +178,11 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "瀹℃牳宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -190,18 +190,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "瀹℃牳宸ヨ祫绫诲瀷澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
- if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶅鏍稿伐璧勭被鍨嬫垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -209,7 +209,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶅鏍稿伐璧勭被鍨嬪け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -227,24 +227,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勭鐢ㄣ�佸弽绂佺敤
+ #region 宸ヨ祫绫诲瀷绂佺敤銆佸弽绂佺敤
/// <summary>
- /// 绂佺敤銆佸弽绂佺敤鏍哥畻鏂瑰紡缁�
+ /// 绂佺敤銆佸弽绂佺敤宸ヨ祫绫诲瀷
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Stop_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
+ public object GetGy_WorkPayType_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
{
string sErrMsg = "";
try
@@ -261,11 +261,11 @@
if (IsStop == 0) //绂佺敤鍒ゆ柇
{
- if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "绂佺敤宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -273,18 +273,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "绂佺敤宸ヨ祫绫诲瀷澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
{
- if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐璧勭被鍨嬫垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -292,7 +292,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐璧勭被鍨嬪け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -310,20 +310,20 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勪繚瀛�
+ #region 宸ヨ祫绫诲瀷淇濆瓨
/// <summary>
- /// 鏍哥畻鏂瑰紡缁勪繚瀛�
+ /// 宸ヨ祫绫诲瀷淇濆瓨
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Save_Json")]
[HttpPost]
- public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
+ public object GetGy_WorkPayType_Save_Json([FromBody] JObject oMain)
{
try
{
@@ -364,37 +364,34 @@
msg2 = msg2.Replace("\\", "");
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;
- //
- oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
- oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
+ List<Model.ClsGy_WorkPayType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkPayType_Model>>(msg2);
+ 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;
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
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 +404,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 +423,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 +437,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 +450,7 @@
if (OperationType == "1")
{
//鏂板
- if (oClassTimePrj.AddNew())
+ if (oBill.AddNew())
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -472,7 +469,7 @@
}
else
{
- if(oClassTimePrj.oModel.HCheckEmp!="")
+ if(oBill.oModel.HCheckEmp!="")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -481,7 +478,7 @@
return objJsonResult;
}
//淇敼
- if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
+ if (oBill.ModifyByID(oBill.oModel.HItemID))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -511,22 +508,22 @@
#endregion
- #region 鏄剧ず鏍哥畻鏂瑰紡缁勪俊鎭�
+ #region 鏄剧ず宸ヨ祫绫诲瀷淇℃伅
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
+ public object GetGy_WorkPayType_Json(Int64 HItemID)
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeListDetail where HItemID=" + HItemID, "h_v_Gy_WorkPayTypeListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭被鍨嬶紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -543,7 +540,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "杩斿洖鏍哥畻鏂瑰紡缁勪俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "杩斿洖宸ヨ祫绫诲瀷淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
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_WorkTypeController.cs"
similarity index 71%
copy from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
copy 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_WorkTypeController.cs"
index 051b596..a6e29c1 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_WorkTypeController.cs"
@@ -12,11 +12,11 @@
namespace WebAPI.Controllers
{
- public class Gy_ClassTimePrjGroupController : ApiController
+ public class Gy_WorkTypeController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- const string ModCaption = "鏍哥畻鏂瑰紡缁�";
- public const string ModRightName = "Gy_ClassTimePrjGroup";
+ const string ModCaption = "宸ョ";
+ public const string ModRightName = "Gy_WorkType";
public const string ModRightNameAdd = ModRightName + "_Add"; //鏂板
public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
@@ -25,18 +25,18 @@
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_WorkType_Ctl oBill = new DAL.ClsGy_WorkType_Ctl();
+ DAL.ClsGy_WorkType_View oBillHlp = new DAL.ClsGy_WorkType_View();
- #region 鏍哥畻鏂瑰紡缁勫垪琛�
+ #region 宸ョ鍒楄〃
/// <summary>
- /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛ㄤ俊鎭�
+ /// 鑾峰彇宸ョ鍒楄〃淇℃伅
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkTypeList_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
+ public object GetGy_WorkTypeList_Json(string sWhere, string HMaker)
{
try
{
@@ -51,7 +51,7 @@
}
//杩斿洖鍒楄〃淇℃伅
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_ClassTimePrjGroupList");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkTypeList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_WorkTypeList");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -78,14 +78,14 @@
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫垹闄�
+ #region 宸ョ鍒犻櫎
/// <summary>
- /// 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// 鍒犻櫎宸ョ
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkType_Delete_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
+ public object GetGy_WorkType_Delete_Json(Int64 HItemID, string HMaker)
{
try
{
@@ -100,25 +100,25 @@
}
//鍒ゆ柇瀛樺湪鎬�
- if (oClassTimePrjHlp.GetInfoByID(HItemID))
+ if (oBillHlp.GetInfoByID(HItemID))
{
//鍒ゆ柇鏄惁瀛樺湪瀛愰」
- if (oClassTimePrj.HavChildCodes(HItemID))
+ if (oBill.HavChildCodes(HItemID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ゆ牳绠楁柟寮忕粍瀛樺湪瀛愰」鐩�,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "姝ゅ伐绉嶅瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
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 = "鍒犻櫎鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "鍒犻櫎宸ョ鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -126,7 +126,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒";
+ objJsonResult.Message = "鍒犻櫎宸ョ澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -135,7 +135,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐绉嶏紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -144,24 +144,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鍒犻櫎宸ョ澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫鏍搞�佸弽瀹℃牳
+ #region 宸ョ瀹℃牳銆佸弽瀹℃牳
/// <summary>
- /// 瀹℃牳銆佸弽瀹℃牳鏍哥畻鏂瑰紡缁�
+ /// 瀹℃牳銆佸弽瀹℃牳宸ョ
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkType_Check_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
+ public object GetGy_WorkType_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
{
string sErrMsg = "";
try
@@ -178,11 +178,11 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "瀹℃牳宸ョ鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -190,18 +190,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "瀹℃牳宸ョ澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
- if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶅鏍稿伐绉嶆垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -209,7 +209,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶅鏍稿伐绉嶅け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -227,24 +227,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ョ澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勭鐢ㄣ�佸弽绂佺敤
+ #region 宸ョ绂佺敤銆佸弽绂佺敤
/// <summary>
- /// 绂佺敤銆佸弽绂佺敤鏍哥畻鏂瑰紡缁�
+ /// 绂佺敤銆佸弽绂佺敤宸ョ
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkType_Stop_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
+ public object GetGy_WorkType_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
{
string sErrMsg = "";
try
@@ -261,11 +261,11 @@
if (IsStop == 0) //绂佺敤鍒ゆ柇
{
- if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "绂佺敤宸ョ鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -273,18 +273,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "绂佺敤宸ョ澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
{
- if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐绉嶆垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -292,7 +292,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐绉嶅け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -310,20 +310,20 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤宸ョ澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勪繚瀛�
+ #region 宸ョ淇濆瓨
/// <summary>
- /// 鏍哥畻鏂瑰紡缁勪繚瀛�
+ /// 宸ョ淇濆瓨
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkType_Save_Json")]
[HttpPost]
- public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
+ public object GetGy_WorkType_Save_Json([FromBody] JObject oMain)
{
try
{
@@ -364,37 +364,38 @@
msg2 = msg2.Replace("\\", "");
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;
+ List<Model.ClsGy_WorkType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkType_Model>>(msg2);
+ 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.HPayMoney = list[0].HPayMoney;
+ oBill.oModel.HDayMoney = list[0].HDayMoney;
+ oBill.oModel.HForEmp = list[0].HForEmp;
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
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 +408,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 +427,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 +441,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 +454,7 @@
if (OperationType == "1")
{
//鏂板
- if (oClassTimePrj.AddNew())
+ if (oBill.AddNew())
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -472,7 +473,7 @@
}
else
{
- if(oClassTimePrj.oModel.HCheckEmp!="")
+ if(oBill.oModel.HCheckEmp!="")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -481,7 +482,7 @@
return objJsonResult;
}
//淇敼
- if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
+ if (oBill.ModifyByID(oBill.oModel.HItemID))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -511,22 +512,22 @@
#endregion
- #region 鏄剧ず鏍哥畻鏂瑰紡缁勪俊鎭�
+ #region 鏄剧ず宸ョ淇℃伅
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
+ [Route("Gy_WorkTypeController/GetGy_WorkType_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
+ public object GetGy_WorkType_Json(Int64 HItemID)
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkTypeListDetail where HItemID=" + HItemID, "h_v_Gy_WorkTypeListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐绉嶏紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -543,7 +544,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "杩斿洖鏍哥畻鏂瑰紡缁勪俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "杩斿洖宸ョ淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
deleted file mode 100644
index 3562648..0000000
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
+++ /dev/null
@@ -1,373 +0,0 @@
-锘縰sing DBUtility;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers.BaseSet
-{
- public class Gy_ClassTimePrjBillController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
- #region 鏍哥畻鏂瑰紡鍒楄〃鏁版嵁
- /// <summary>
- /// 杩斿洖鏍哥畻鏂瑰紡鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/list")]
- [HttpGet]
- public object list(string sWhere,string user)
- {
- try
- {
- if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList order by 鏍哥畻鏂瑰紡浠ｇ爜 ", "h_v_Gy_ClassTimePrjList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by 鏍哥畻鏂瑰紡浠ｇ爜 ";
- ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鍒犻櫎鏍哥畻鏂瑰紡
- /// <summary>
- /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/Delete_Json")]
- [HttpGet]
- public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
- {
- DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
- try
- {
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oDeptHlp.GetInfoByID(HItemID))
- {
- if (oDept.HavChildCodes(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
- if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //
- if (oDept.DeleteByID(HItemID))
- {
- //鍐欏叆鏃ュ織
- ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
- //鏇存柊涓婄骇涓� 鏈骇
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鏍哥畻鏂瑰紡鏂板淇濆瓨
- /// <summary>
- /// 鏍哥畻鏂瑰紡-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/AddBill")]
- [HttpPost]
- public object AddBill([FromBody] JObject oMain)
- {
- try
- {
- oCN.BeginTran();
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
- string msg5 = sArray[3].ToString();
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ClassTimePrj_Model>>(msg2);
- long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- long HParentID = list[0].HParentID;
- long HLevel= list[0].HLevel;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- long HDeptID = list[0].HDeptID;
- long HGroupID = list[0].HGroupID;
-
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
-
- //涓昏〃
- oCN.RunProc("Insert Into Gy_ClassTimePrj " +
- "(HNumber,HName,HParentID,HDeptID,HGroupID" +
- ",HStopflag,HRemark,HUseFlag) " +
- " values('" + HNumber + "','" + HName + "','" + HParentID + "','" + HDeptID + "','" + HGroupID + "'" +
- ",'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�')");
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鎴愬姛锛�";
- //objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鏍哥畻鏂瑰紡淇敼淇濆瓨
- /// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/EditBill")]
- [HttpPost]
- public object EditBill([FromBody] JObject oMain)
- {
-
- try
- {
- DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
-
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
- string msg5 = sArray[3].ToString();
-
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ClassTimePrj_Model>>(msg2);
-
- long HItemID = int.Parse(msg3);
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- long HDeptID = list[0].HDeptID;
- long HGroupID = list[0].HGroupID;
-
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_ClassTimePrj set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HParentID=" + HParentID +
- ",HDeptID=" + HDeptID +
- ",HGroupID=" + HGroupID +
- ",HStopflag='" + HStopflag + "'" +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- //
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鏍哥畻鏂瑰紡淇敼鑾峰彇缁戝畾鏁版嵁
- /// <summary>
- /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/xg")]
- [HttpGet]
- public object xg(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where HItemID=" + HInterID, "h_v_Gy_ClassTimePrjList");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- }
-}
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
index 4748a1d..fd06a47 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
@@ -203,17 +203,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCn.RunProcReturn("select * from h_v_PM_ProjectBillMYList order by 鍗曟嵁鍙� desc", "h_v_PM_ProjectBillMYList");
- }
- else
- {
- string sql1 = "select * from h_v_PM_ProjectBillMYList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
- ds = oCn.RunProcReturn(sql, "h_v_PM_ProjectBillMYList");
- }
+ string sql = "exec h_p_My_PM_ProjectReportBill " + user+",0,''";
+ ds=oCn.RunProcReturn(sql, "h_p_My_PM_ProjectReportBill");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -226,7 +217,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds;
objJsonResult.list = columnNameList;
return objJsonResult;
}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 98a45ec..4d6539a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,8 +342,6 @@
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -443,8 +441,6 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
<Compile Include="Controllers\MateOutController.cs" />
@@ -532,7 +528,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjGroupController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -542,7 +540,7 @@
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
--
Gitblit v1.9.1