From bc6ac881fd5cb8cd71f27b28394977d1e200da3e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 21 十二月 2021 15:15:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/ListModels.cs | 14 ++
WebAPI/Models/工资管理/ClsGy_GroupEmpListMain.cs | 12 +
WebAPI/Models/工资管理/ClsGy_GroupEmpListSub.cs | 12 +
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs | 263 +++++++++++++++++++++++++++++++++++++
WebAPI/DLL/工资管理/ClsGy_GroupEmpBill.cs | 106 +++++++++++++++
WebAPI/WebAPI.csproj | 4
6 files changed, 411 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
new file mode 100644
index 0000000..fc43e58
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
@@ -0,0 +1,263 @@
+锘縰sing 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_GroupEmpBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+
+ /// <summary>
+ /// 杩斿洖 鐝粍鑱屽憳娓呭崟 鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_GroupEmpBill/GetGroupEmpBill")]
+ [HttpGet]
+ public object GetGroupEmpBill(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetGroupEmpBill(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetGroupEmpBill(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by 鏃ユ湡 desc", "h_v_Gy_GroupEmpBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_GroupEmpBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
+ }
+
+ }
+
+ #region[鐝粍鑱屽憳娓呭崟鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Gy_GroupEmpBillListCheckDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_GroupEmpBillList where hmainid= " + HID + " ", "h_v_Gy_GroupEmpBillList");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[鐝粍鑱屽憳娓呭崟鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
+ [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListProjectDetai")]
+ [HttpGet]
+ public object Gy_GroupEmpBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT " +
+ "HGroupID,鐝粍浠ｇ爜,鐝粍,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
+ ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡" +
+ ",HEmpID,HEmpNumber,HEmpName ,琛ㄤ綋澶囨敞 as HRemark FROM h_v_Gy_GroupEmpBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ [Route("Gy_GroupEmpBill/SaveGetGroupEmpBillList")]
+ [HttpPost]
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ public object SaveGetGroupEmpBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ //string msg4 = sArray[3].ToString();
+
+ string UserName = "";
+ string s = "";
+ long mouldid;
+ ListModels oListModels = new ListModels();
+ try
+ {
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DLL.ClsGy_GroupEmpBill oBill = new DLL.ClsGy_GroupEmpBill();
+ List<Models.ClsGy_GroupEmpListMain> lsmain = new List<Models.ClsGy_GroupEmpListMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_GroupEmpListMain(msg2);
+ foreach (Models.ClsGy_GroupEmpListMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "9876";
+ oItem.HBillSubType = "9876";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Models.ClsGy_GroupEmpListSub> ls = new List<Models.ClsGy_GroupEmpListSub>();
+ ls = oListModels.getObjectByJson_Gy_GroupEmpListSub(msg3);
+ int i = 0;
+ foreach (Models.ClsGy_GroupEmpListSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, 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;
+ }
+ }
+
+ /// <summary>
+ ///鐝粍鑱屽憳娓呭崟鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_GroupEmpBill/DeltetGroupEmpBill")]
+ [HttpGet]
+ public object DeltetGroupEmpBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Gy_GroupEmpListMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Gy_GroupEmpListSub where HInterID = " + HInterID);
+ 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.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs" "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
new file mode 100644
index 0000000..dddb1cf
--- /dev/null
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
@@ -0,0 +1,106 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_GroupEmpBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsGy_GroupEmpListMain omodel = new Models.ClsGy_GroupEmpListMain();
+ public List<Models.ClsGy_GroupEmpListSub> DetailColl = new List<Models.ClsGy_GroupEmpListSub>();
+
+ public ClsGy_GroupEmpBill()
+ {
+ base.MvarItemKeySub = "Gy_GroupEmpListSub";
+ base.MvarItemKeySub2 = " ";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_GroupEmpListMain";
+ base.MvarReportTitle = "鐝粍鑱屽憳娓呭崟";
+ base.BillType = "9876";
+ base.HBillSubType = "9876";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsGy_GroupEmpBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_GroupEmpListMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HGroupID=" + omodel.HGroupID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ string sql = string.Format(@"Insert Into Gy_GroupEmpListMain(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HGroupID,HMaker,HMakeDate) values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupID.ToString() + "','" + DBUtility.ClsPub.CurUserName + "',getdate())");
+ oCn.RunProc(sql);
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ }
+
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index f247548..fadab98 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1903,6 +1903,20 @@
return list;
}
#endregion
+ #region 鐝粍鑱屽憳娓呭崟
+ public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsGy_GroupEmpListSub> getObjectByJson_Gy_GroupEmpListSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListSub>>(jsonString);
+ return list;
+ }
+ #endregion
/// <summary>
/// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟涓昏〃json
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs"
new file mode 100644
index 0000000..6b5d835
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs"
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_GroupEmpListMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HGroupID;// int //班组ID
+
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs"
new file mode 100644
index 0000000..6a72282
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs"
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_GroupEmpListSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HEmpID;
+
+ }
+}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index bebb54c..f87bfcf 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -354,6 +354,7 @@
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\PurchaseOrderController.cs" />
<Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_GroupEmpBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_WorkTimesBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
@@ -452,6 +453,7 @@
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
@@ -506,7 +508,9 @@
<Compile Include="Models\ClsOA_InformBillSub.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListSub.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillSub.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
--
Gitblit v1.9.1