From cd3c2209a716b0a1a22cd094b860c92104d7c9b1 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 29 九月 2021 17:35:57 +0800
Subject: [PATCH] 增加工种模块+增加工资类型模块
---
WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs | 219 ++++++++++++++++++
WebAPI/ListModels.cs | 24 ++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +-
WebAPI/DLL/ClsGy_WorkPayTypeBill.cs | 80 ++++++
WebAPI/DLL/ClsGy_WorkTypeBill.cs | 92 +++++++
WebAPI/WebAPI.csproj | 4
WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs | 218 ++++++++++++++++++
7 files changed, 654 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
new file mode 100644
index 0000000..104769c
--- /dev/null
+++ b/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
@@ -0,0 +1,218 @@
+锘縰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)
+ {
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎宸ヨ祫绫诲瀷
+ /// <summary>
+ /// 宸ヨ祫绫诲瀷鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkPayTypeBill/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(string HInterID)
+ {
+ //鐢╥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();
+
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ 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
new file mode 100644
index 0000000..50fb796
--- /dev/null
+++ b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
@@ -0,0 +1,219 @@
+锘縰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)
+ {
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎宸ョ
+ /// <summary>
+ /// 宸ョ鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkTypeBill/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(string HInterID)
+ {
+ //鐢╥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();
+
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ 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/DLL/ClsGy_WorkPayTypeBill.cs b/WebAPI/DLL/ClsGy_WorkPayTypeBill.cs
new file mode 100644
index 0000000..54c2f06
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_WorkPayTypeBill.cs
@@ -0,0 +1,80 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_WorkPayTypeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_WorkPayType_Model omodel = new Model.ClsGy_WorkPayType_Model();
+
+ public ClsGy_WorkPayTypeBill()
+ {
+ base.MvarItemKeySub = "";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_WorkPayType";
+ base.MvarReportTitle = "宸ヨ祫绫诲瀷";
+ base.BillType = "";
+ base.HBillSubType = "";
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Gy_WorkPayType " +
+ "(HNumber,HName,HHelpCode,HRemark,HStopflag,HUseFlag,HShortNumber,HParentID,HLevel,HEndFlag" +
+ ") " +
+ " values('" + omodel.HNumber + "','" + omodel.HName + "','" +
+ omodel.HHelpCode + "','" + omodel.HRemark + "','" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "','鏈娇鐢�','" +
+ omodel.HNumber + "',0,0,0" +
+ ") ");
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_WorkPayType set " +
+ " HNumber='" + omodel.HNumber + "'" + //鍥哄畾璧嬪��===============
+ ",HName='" + omodel.HName + "'" +
+ ",HHelpCode='" + omodel.HHelpCode + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HStopflag='" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "'" +
+
+ " where HItemID=" + lngBillKey.ToString());
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsGy_WorkTypeBill.cs b/WebAPI/DLL/ClsGy_WorkTypeBill.cs
new file mode 100644
index 0000000..b764ed9
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_WorkTypeBill.cs
@@ -0,0 +1,92 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_WorkTypeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_WorkType_Model omodel = new Model.ClsGy_WorkType_Model();
+ public List<Model.ClsGy_WorkTypeSub> DetailColl = new List<Model.ClsGy_WorkTypeSub>();
+
+ public ClsGy_WorkTypeBill()
+ {
+ base.MvarItemKeySub = "";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_WorkType";
+ base.MvarReportTitle = "宸ョ璁剧疆";
+ base.BillType = "";
+ base.HBillSubType = "";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsGy_WorkTypeBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Gy_WorkType " +
+ "(HNumber,HName,HPayMoney,HDayMoney,HHelpCode,HForEmp,HRemark,HStopflag,HUseFlag,HShortNumber,HParentID,HLevel,HEndFlag" +
+ ") " +
+ " values('" + omodel.HNumber+"','"+ omodel.HName + "','" + omodel.HPayMoney + "','" + omodel.HDayMoney + "','"+
+ omodel.HHelpCode + "','" + omodel.HForEmp + "','" + omodel.HRemark + "','" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "','鏈娇鐢�','"+
+ omodel.HNumber + "',0,0,0" +
+ ") ");
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_WorkType set " +
+ " HNumber='" + omodel.HNumber + "'" + //鍥哄畾璧嬪��===============
+ ",HName='" + omodel.HName + "'" +
+ ",HPayMoney='" + omodel.HPayMoney + "'" +
+ ",HDayMoney='" + omodel.HDayMoney + "'" +
+ ",HHelpCode='" + omodel.HHelpCode + "'" +
+ ",HForEmp='" + omodel.HForEmp + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HStopflag='" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "'" +
+
+ " where HItemID=" + lngBillKey.ToString());
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 9c55494..9ba6d9b 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -620,6 +620,30 @@
}
/// <summary>
+ /// 澶勭悊鏂板宸ョ璁板綍琛ㄤ富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_WorkType_Model> getObjectByJson_Gy_WorkTypeBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_WorkType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkType_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板宸ヨ祫绫诲瀷璁板綍琛ㄤ富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_WorkPayType_Model> getObjectByJson_Gy_WorkPayTypeBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_WorkPayType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkPayType_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄤ富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 3c5972f..ec9a764 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/28/2021 19:05:53</publishTime>
+ <publishTime>09/29/2021 17:04:09</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/28/2021 19:05:53</publishTime>
+ <publishTime>09/29/2021 17:04:09</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/28/2021 19:05:52</publishTime>
+ <publishTime>09/29/2021 17:04:07</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/28/2021 19:05:52</publishTime>
+ <publishTime>09/29/2021 17:04:07</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/28/2021 19:05:48</publishTime>
+ <publishTime>09/29/2021 17:04:03</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/28/2021 19:05:48</publishTime>
+ <publishTime>09/29/2021 17:04:03</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/28/2021 19:05:49</publishTime>
+ <publishTime>09/29/2021 17:04:04</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/28/2021 19:05:49</publishTime>
+ <publishTime>09/29/2021 17:04:04</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/28/2021 19:05:46</publishTime>
+ <publishTime>09/29/2021 17:04:01</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/28/2021 19:05:46</publishTime>
+ <publishTime>09/29/2021 17:04:01</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/28/2021 19:05:47</publishTime>
+ <publishTime>09/29/2021 17:04:02</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/28/2021 19:05:47</publishTime>
+ <publishTime>09/29/2021 17:04:02</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/28/2021 19:05:47</publishTime>
+ <publishTime>09/29/2021 17:04:02</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/28/2021 19:05:47</publishTime>
+ <publishTime>09/29/2021 17:04:02</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/28/2021 19:05:56</publishTime>
+ <publishTime>09/29/2021 17:04:11</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/28/2021 19:05:56</publishTime>
+ <publishTime>09/29/2021 17:04:11</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/28/2021 19:06:03</publishTime>
+ <publishTime>09/29/2021 17:04:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5174b5f..7bf33cf 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -318,6 +318,8 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.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\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
@@ -371,6 +373,8 @@
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
<Compile Include="DLL\ClsGy_Material_Ctl.cs" />
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
+ <Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
--
Gitblit v1.9.1