APSM/Sc_ICMOSortBillFun.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
APSM/装配智能排程/Sc_ICMOAutoSortBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
APSM/装配智能排程/Sc_ICMOAutoSortBill.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
APSM/装配智能排程/Sc_ICMOAutoSortBill.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WarM/条码打印/Gy_BarCodeBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/Pay_ReportController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
APSM/Sc_ICMOSortBillFun.cs
@@ -2002,7 +2002,7 @@ { if (sLeftQty > 0) { if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["æ¥æ"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag)) if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["æ¥æ"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag)) //è¡¨æ ¼çæ é¢ä¸ ä¿åäºæ¥æï¼ { //妿æ¶é´è¢« ä¸éä½éå ç¨ å è·³è¿ b = false; @@ -2044,7 +2044,7 @@ oClsGridValues.Add(oSub); } } else else //ååä¸éè¦èèå çï¼ä¸é¢çè¿ä¸æ®µä¸éè¦ { if (sLeftQty > sWorkQty * DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[i]["æå¤§å©ä½å·¥æ¶"])) { APSM/×°ÅäÖÇÄÜÅųÌ/Sc_ICMOAutoSortBill.cs
@@ -692,7 +692,7 @@ //å¤æèµæºå©ä½å·¥æ¶ï¼æ¯å¦å¤§äº çäº§å¨æ if (DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[j]["å©ä½å·¥æ¶"]) > sLeftProdTimes) { if (iLeftQty > 0) if (iLeftQty > 0) // ç产订åå©ä½æ°é { //卿¬èµæºä¸ç产 //è·å该çäº§èµæºçå©ä½å·¥æ¶è¿è¡æç¨ã @@ -705,7 +705,7 @@ dsSub = Sc_ICMOSortBillFun.GetWorkSourceTimeBySource(oCn, lSourceID); if (dsSub == null || dsSub.Tables[0].Rows.Count == 0) { continue; continue;//å¦ææ²¡æå©ä½å æ§è¡ä¸ä¸ä¸ªç产订å } if (dsSub != null )//ä¸å çæç¨ { APSM/×°ÅäÖÇÄÜÅųÌ/Sc_ICMOAutoSortBill.designer.cs
@@ -107,6 +107,7 @@ this.Tool.SuspendLayout(); this.pPic.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spc1)).BeginInit(); this.spc1.Panel1.SuspendLayout(); this.spc1.Panel2.SuspendLayout(); this.spc1.SuspendLayout(); @@ -866,12 +867,13 @@ this.grdSourceBill.Margin = new System.Windows.Forms.Padding(4); this.grdSourceBill.Name = "grdSourceBill"; this.grdSourceBill.ReadOnly = true; this.grdSourceBill.RowHeadersWidth = 51; this.grdSourceBill.RowTemplate.Height = 23; this.grdSourceBill.Size = new System.Drawing.Size(1571, 745); this.grdSourceBill.TabIndex = 20; this.grdSourceBill.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSourceBill_CellBeginEdit); this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit); this.grdSourceBill.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellClick); this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit); this.grdSourceBill.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdSourceBill_EditingControlShowing); this.grdSourceBill.KeyDown += new System.Windows.Forms.KeyEventHandler(this.grdSourceBill_KeyDown); // @@ -898,6 +900,7 @@ this.grdMain.Margin = new System.Windows.Forms.Padding(4); this.grdMain.Name = "grdMain"; this.grdMain.ReadOnly = true; this.grdMain.RowHeadersWidth = 51; this.grdMain.RowTemplate.Height = 23; this.grdMain.Size = new System.Drawing.Size(1571, 745); this.grdMain.TabIndex = 21; @@ -941,6 +944,7 @@ this.grdSource.Margin = new System.Windows.Forms.Padding(4); this.grdSource.Name = "grdSource"; this.grdSource.ReadOnly = true; this.grdSource.RowHeadersWidth = 51; this.grdSource.RowTemplate.Height = 23; this.grdSource.Size = new System.Drawing.Size(1571, 0); this.grdSource.TabIndex = 0; @@ -968,6 +972,7 @@ this.grdICMO.Margin = new System.Windows.Forms.Padding(4); this.grdICMO.Name = "grdICMO"; this.grdICMO.ReadOnly = true; this.grdICMO.RowHeadersWidth = 51; this.grdICMO.RowTemplate.Height = 23; this.grdICMO.Size = new System.Drawing.Size(1571, 0); this.grdICMO.TabIndex = 1; @@ -994,6 +999,7 @@ this.grdProcFlow.Margin = new System.Windows.Forms.Padding(4); this.grdProcFlow.Name = "grdProcFlow"; this.grdProcFlow.ReadOnly = true; this.grdProcFlow.RowHeadersWidth = 51; this.grdProcFlow.RowTemplate.Height = 23; this.grdProcFlow.Size = new System.Drawing.Size(1579, 7); this.grdProcFlow.TabIndex = 2; @@ -1022,6 +1028,7 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.spc1.Panel1.ResumeLayout(false); this.spc1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.spc1)).EndInit(); this.spc1.ResumeLayout(false); this.tabControl1.ResumeLayout(false); this.tabPage3.ResumeLayout(false); APSM/×°ÅäÖÇÄÜÅųÌ/Sc_ICMOAutoSortBill.resx
@@ -112,15 +112,15 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB @@ -4204,10 +4204,10 @@ //////////////////////////////////////////////////////////////////////8A </value> </data> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>95, 17</value> </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>25</value> </metadata> </root> Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -135,7 +135,19 @@ { omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //æ¶æéç¥å(éè´§åãå°è´§ç¡®è®¤ï¼ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl") { omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_AutoCheck") { omodel.Cg_POInStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_ERPMode") { omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //éè´å ¥åºå if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck") { Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -22,6 +22,11 @@ public string Sc_ICMOReportBill_UpdateSourceInterID; //ä¸ä¼ ååå¡«æ¡ç æ¡£æ¡æºåä¿¡æ¯ public string Sc_ICMOReportBill_MESFlag; //çäº§æ±æ¥å忥MESæ è®°ï¼Yä¸ºåæ¥ //æ¶æéç¥å(éè´§åãå°è´§ç¡®è®¤ï¼ public string Cg_POInStockBill_AutoCheck; //æ¯å¦èªå¨å®¡æ ¸ public string Cg_POInStockBill_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDï¼ public string Cg_POInStockBill_BarCodeCtl; //å°è´§ç¡®è®¤å¿ é¡»æ«ç ç®±æ¡ç //éè´å ¥åº public string Kf_POStockInBill_AutoCheck; //æ¯å¦èªå¨å®¡æ ¸ public string Kf_POStockInBill_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDï¼ WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -824,9 +824,9 @@ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]); LSHlen = 4; if (sTMNumber.Length != 16) if (sTMNumber.Length != 16 && sTMNumber.Length != 15) { MessageBox.Show("æ¡ç é¿åº¦ä¸å¤16ä½ï¼æ¯å¦æ°æ®ä¸å ¨ï¼å¶é æ¬é¨1ä½:[0] + æºå代ç 5ä½:[" + HModelName + "] + å¹´ææ¥5ä½:["+ HBarCodeDate + "] + æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "]+ å缩æº1ä½:["+ HYasuoji + "]+00 ; "); MessageBox.Show("æ¡ç é¿åº¦ä¸å¤15æ16ä½ï¼æ¯å¦æ°æ®ä¸å ¨ï¼å¶é æ¬é¨1ä½:[0] + æºå代ç 5ä½:[" + HModelName + "] + å¹´ææ¥4æ5ä½:["+ HBarCodeDate + "] + æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "]+ å缩æº1ä½:["+ HYasuoji + "]+00 ; "); return; } } @@ -839,9 +839,9 @@ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]); LSHlen = 4; if (sTMNumber.Length != 18) if (sTMNumber.Length != 18 && sTMNumber.Length != 17) { MessageBox.Show("æ¡ç é¿åº¦ä¸å¤18ä½ï¼æ¯å¦æ°æ®ä¸å ¨ï¼ç©æä»£ç 11ä½:["+ HMaterNumber.Replace(".", "") + "]+å¹´ææ¥5ä½:["+ HBarCodeDate + "]+æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "];"); MessageBox.Show("æ¡ç é¿åº¦ä¸å¤17æ18ä½ï¼æ¯å¦æ°æ®ä¸å ¨ï¼ç©æä»£ç 11ä½:["+ HMaterNumber.Replace(".", "") + "]+å¹´ææ¥4æ5ä½:["+ HBarCodeDate + "]+æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "];"); return; } } WebAPI/Controllers/Pay_ReportController.cs
New file @@ -0,0 +1,372 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; 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 { /// <summary> /// å·¥èµæ¥è¡¨èå忍¡åæ¥å£ /// </summary> public class Pay_ReportController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region [èåæç»å表] [Route("Pay_EmpDet/list")] [HttpGet] public object PayEmpDetList(string HBDate, string HEDate, string HBENumber, string HEENumber, string HBMNumber, string HEMNumber, string HBPNumber, string HEPNumber) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_EmpWorkQtyEntryReport '" + HBDate + "','" + HEDate + "','" + HBENumber + "','" + HEENumber + "','" + HBMNumber + "','" + HEMNumber + "','" + HBPNumber + "','" + HEPNumber + "'", "h_p_Pay_EmpWorkQtyEntryReport"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; //foreach (DataColumn col in ds.Tables[1].Columns) //{ // Type dataType = col.DataType; // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; // columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå //} //if (ds.Tables[1].Rows.Count > 0) //{ // objJsonResult.code = "1"; // objJsonResult.count = ds.Tables[0].Rows.Count; // objJsonResult.Message = "è·åèµæºç»å®æ°æ®æåï¼"; // objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //åºååDataSetä¸çæ¶é´æ ¼å¼ï¼ç¶ååååºåå忥 // objJsonResult.list = columnNameList; // return objJsonResult; //} //else //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ æ°æ®ï¼"; // objJsonResult.data = null; // objJsonResult.list = columnNameList; // return objJsonResult; //} } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [é¨é¨åæ¾æ¸ å] [Route("Pay_Department/list")] [HttpGet] public object PayDepartment(int HYear,int HPeriod,int DeptID) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_PayMentDeptSendList '" + HYear + "','" + HPeriod + "','" + DeptID + "'", "h_p_Pay_PayMentDeptSendList"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [é¨é¨å¹´åº¦åæ] [Route("Pay_DepYearAnalyze/list")] [HttpGet] public object PayDepYearAnalyze(string DeptID,string EDeptID,int Year) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_PayMentDeptYearReport '" + DeptID + "','" + EDeptID + "','" + Year + "'", "h_p_PayMentDeptYearReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [å·¥èµåæ¾æ¸ å] [Route("Pay_Wages/list")] [HttpGet] public object PayWages(int HYear, int HPeriod, int DeptID) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_PayMentSendList '" + HYear + "','" + HPeriod + "','" + DeptID + "'", "h_p_Pay_PayMentSendList"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [å·¥èµå¹´æ¥è¡¨] [Route("Pay_YearReport/list")] [HttpGet] public object PayYearReport(string DeptID, string EDeptID, int Year) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_PayMentYearReport '" + DeptID + "','" + EDeptID + "','" + Year + "'", "h_p_PayMentYearReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [è夿±æ»è¡¨] [Route("Pay_Attendance/list")] [HttpGet] public object PayAttendance(int HYear,int HPeriod, int DeptID, string HStatus,string HType) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_WorkTimesList '" + HYear + "','" + HPeriod + "','" + DeptID + "','" + HStatus + "','" + HType+ "'", "h_p_Pay_WorkTimesList"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [è®¡ä»¶å·¥èµæ±æ»åæ] [Route("Pay_ByThePiece_SumAna/list")] [HttpGet] public object PayByThePieceSum(int HYear,int HPeriod,string DeptNumber, string DeptNumber2, string GroupNumber, string GroupNumber2) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_EmpPayMentSumReport '" + HYear + "','" + HPeriod + "','" + DeptNumber + "','" + DeptNumber2 + "','" + GroupNumber + "','" + GroupNumber2 + "'", "h_p_Pay_EmpPayMentSumReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [计æ¶å·¥èµæç»è¡¨] [Route("Pay_ByTheTime_Detail/list")] [HttpGet] public object PayByTheTimeDetail(string HBDate, string HEDate, string HBDeptNumber, string HEDeptNumber, string HBEmpNumber, string HEEmpNumber) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_WorkTimesPayMentEntryReport '" + HBDate + "','" + HEDate + "','" + HBDeptNumber + "','" + HEDeptNumber + "','" + HBEmpNumber + "','" + HEEmpNumber + "'", "h_p_Pay_WorkTimesPayMentEntryReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [计æ¶å·¥èµæ±æ»è¡¨] [Route("Pay_ByTheTime_Sum/list")] [HttpGet] public object PayByTheTimeSum(string HBDate, string HEDate, string HBDeptNumber, string HEDeptNumber, string HBEmpNumber, string HEEmpNumber) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_WorkTimesPayMentSumReport '" + HBDate + "','" + HEDate + "','" + HBDeptNumber + "','" + HEDeptNumber + "','" + HBEmpNumber + "','" + HEEmpNumber + "'", "h_p_Pay_WorkTimesPayMentSumReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [è®¡ä»¶å·¥èµæç»è¡¨] [Route("Pay_ByThePiece_Detail/list")] [HttpGet] public object PayByThePieceDetail(string HBDate, string HEDate, string HBDeptNumber, string HEDeptNumber, string HBEmpNumber, string HEEmpNumber) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_SingleBalBillEntryReport '" + HBDate + "','" + HEDate + "','" + HBDeptNumber + "','" + HEDeptNumber + "','" + HBEmpNumber + "','" + HEEmpNumber + "'", "h_p_Pay_SingleBalBillEntryReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion #region [è®¡ä»¶å·¥èµæ±æ»è¡¨] [Route("Pay_ByThePiece_Sum/list")] [HttpGet] public object PayByThePieceSum(string HBDate, string HEDate, string HBDeptNumber, string HEDeptNumber, string HBEmpNumber, string HEEmpNumber) { List<object> columnNameList = new List<object>(); try { ds = oCN.RunProcReturn("exec h_p_Pay_SingleBalBillSumReport '" + HBDate + "','" + HEDate + "','" + HBDeptNumber + "','" + HEDeptNumber + "','" + HBEmpNumber + "','" + HEEmpNumber + "'", "h_p_Pay_SingleBalBillSumReport"); 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 = e.Message.ToString(); objJsonResult.data = null; objJsonResult.list = columnNameList; } return objJsonResult; } #endregion } } WebAPI/WebAPI.csproj
@@ -384,6 +384,7 @@ <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" /> <Compile Include="Controllers\Gy_MateMouldController.cs" /> <Compile Include="Controllers\Pay_ReportController.cs" /> <Compile Include="Controllers\SCGL\æ¥è®¡å管ç\DataHelper.cs" /> <Compile Include="Controllers\SCGL\æ¥è®¡å管ç\JIT_Cg_PODemandPlanBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" /> @@ -864,6 +865,7 @@ <Folder Include="Views\Kf_StepFoldOutBill\" /> <Folder Include="Views\Mes_OrderProcFlowAllReport\" /> <Folder Include="Views\MoveStockBill\" /> <Folder Include="Views\Pay_Report\" /> <Folder Include="Views\ProductionPlanReport\" /> <Folder Include="Views\ProductionReturnBill\" /> <Folder Include="Views\QC_Management\" />