From 981e65a58c087f16fcff1777ea82f23759e84e5d Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 28 十月 2024 17:57:24 +0800 Subject: [PATCH] 1 --- sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 2 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 14 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44 ++-- SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0 WebAPI/WebAPI.csproj.user | 2 DAL/计划管理/ClsGy_RoutingBill.cs | 4 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 WebAPI/Controllers/CKGL/TMZD/Gy_BarCodeBillListController.cs | 96 ++++++------ WebAPI/Controllers/LMESController.cs | 2 SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs | 63 +++++++ WebAPI/Controllers/Pay_ReportController.cs | 226 ++++++++++++++++++++++++++++ SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0 WebAPI/Web.config | 2 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 18 files changed, 372 insertions(+), 83 deletions(-) diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" index b8b1134..4a5baff 100644 --- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" +++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" @@ -108,7 +108,7 @@ ") "); } // - oCn.RunProc("exec h_p_Gy_RoutingBillCheck " + omodel.HInterID.ToString()); //璁剧疆榛樿宸ヨ壓璺嚎 + oCn.RunProc("exec h_p_Gy_RoutingBillCheck " + omodel.HInterID.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'"); //璁剧疆榛樿宸ヨ壓璺嚎 //oCn.RunProc("exec h_p_Sc_ProcessExchangeBillSetUpdate " + omodel.HInterID.ToString()); //璁剧疆棣栭亾鏈亾 娴佽浆鏍囪 绛� 瀛楁銆� // //鍒ゆ柇鏄惁閲嶅宸ュ簭鍙� @@ -242,7 +242,7 @@ ") "); } // - oCn.RunProc("exec h_p_Gy_RoutingBillCheck " + omodel.HInterID.ToString()); //璁剧疆榛樿宸ヨ壓璺嚎 + oCn.RunProc("exec h_p_Gy_RoutingBillCheck " + omodel.HInterID.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'"); //璁剧疆榛樿宸ヨ壓璺嚎 //oCn.RunProc("exec h_p_Sc_ProcessExchangeBillSetUpdate " + omodel.HInterID.ToString()); //璁剧疆棣栭亾鏈亾 娴佽浆鏍囪 绛� 瀛楁銆� // //鍒ゆ柇鏄惁閲嶅宸ュ簭鍙� diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll index 8c60c24..95849dc 100644 --- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll +++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll Binary files differ diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb index 8366b4d..be6ecd0 100644 --- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb +++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index 6f074c6..09700dc 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -9,10 +9,10 @@ C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll index 8c60c24..95849dc 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb index 8366b4d..be6ecd0 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb Binary files differ diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs index 9f288aa..5af371b 100644 --- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs +++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs @@ -20,6 +20,69 @@ DataSet ds; Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + #region 鐢熶骇璁㈠崟鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ鍏ㄩ儴閿�鍞鍗曞彿 + [Route("Mes_OrderProcFlowAllReport/getHSeOrderBillNo")] + [HttpGet] + public object getHSeOrderBillNo() + { + try + { + ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain"); + + 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 鐢熶骇璁㈠崟鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ + [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList")] + [HttpGet] + public object OrderProcFlowAllReportICMOList(string sWhere) + { + try + { + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� + + ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_ICMO " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_ICMO"); + + List<object> listCol = new List<object>(); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + listCol.Add(JsonConvert.DeserializeObject(str)); + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = listCol; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")] [HttpGet] diff --git a/WebAPI/Controllers/CKGL/TMZD/Gy_BarCodeBillListController.cs b/WebAPI/Controllers/CKGL/TMZD/Gy_BarCodeBillListController.cs index 6a713dd..3f03a4c 100644 --- a/WebAPI/Controllers/CKGL/TMZD/Gy_BarCodeBillListController.cs +++ b/WebAPI/Controllers/CKGL/TMZD/Gy_BarCodeBillListController.cs @@ -22,56 +22,56 @@ DataSet ds; #region 鏉$爜涓绘。鍒嗛〉鍒楄〃 - [Route("Gy_BarCodeBillList/page")] - [HttpGet] - public json page(string sWhere, string user, int page, int size) - { - json res = new json(); - try - { - List<object> columnNameList = new List<object>(); - //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; - objJsonResult.data = null; - return objJsonResult; - } - if (sWhere == null || sWhere.Equals("")) - { - ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",''", "h_p_IF_BarCodeBillList"); - } - else - { - ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList"); - } + //[Route("Gy_BarCodeBillList/page")] + //[HttpGet] + //public json page(string sWhere, string user, int page, int size) + //{ + // json res = new json(); + // try + // { + // List<object> columnNameList = new List<object>(); + // //缂栬緫鏉冮檺 + // if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user)) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // if (sWhere == null || sWhere.Equals("")) + // { + // ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",''", "h_p_IF_BarCodeBillList"); + // } + // else + // { + // ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList"); + // } - //娣诲姞鍒楀悕 - foreach (DataColumn col in ds.Tables[0].Columns) - { - Type dataType = col.DataType; - string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; - columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 - } + // //娣诲姞鍒楀悕 + // foreach (DataColumn col in ds.Tables[0].Columns) + // { + // Type dataType = col.DataType; + // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + // columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + // } - res.code = CodeConstant.SUCCEED; - res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); - res.Message = "Sucess锛�"; - res.list = columnNameList; - res.data = ds.Tables[0]; - return res; - } - catch (Exception e) - { - res.code = CodeConstant.FAIL; - res.count = CountConstant.FAIL; - res.Message = "Exception锛�" + e.ToString(); - res.data = null; - return objJsonResult; - } - } + // res.code = CodeConstant.SUCCEED; + // res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); + // res.Message = "Sucess锛�"; + // res.list = columnNameList; + // res.data = ds.Tables[0]; + // return res; + // } + // catch (Exception e) + // { + // res.code = CodeConstant.FAIL; + // res.count = CountConstant.FAIL; + // res.Message = "Exception锛�" + e.ToString(); + // res.data = null; + // return objJsonResult; + // } + //} #endregion } } \ No newline at end of file diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs index e47dfbf..8148620 100644 --- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs +++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs @@ -372,11 +372,11 @@ //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾� - if (HStandard) - { - //璁剧疆榛樿宸ヨ壓璺嚎 - oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'"); - } + //if (HStandard) + //{ + // //璁剧疆榛樿宸ヨ壓璺嚎 + // oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'"); + //} //鍒ゆ柇鏄惁閲嶅宸ュ簭鍙� ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl"); @@ -1278,7 +1278,7 @@ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 { //鍒锋柊榛樿宸ヨ壓璺嚎 - oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + CurUserName + "'"); } } @@ -2292,7 +2292,7 @@ return objJsonResult; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 澶辨晥鏃堕棿 BETWEEN NOW() - INTERVAL 15 DAY AND NOW() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 澶辨晥鏃堕棿 BETWEEN DATEADD(DAY, -15, GETDATE()) AND GETDATE() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList"); foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index d37daa8..21336e2 100644 --- a/WebAPI/Controllers/LMESController.cs +++ b/WebAPI/Controllers/LMESController.cs @@ -3620,7 +3620,7 @@ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 { //鍒锋柊榛樿宸ヨ壓璺嚎 - oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'"); } } diff --git a/WebAPI/Controllers/Pay_ReportController.cs b/WebAPI/Controllers/Pay_ReportController.cs index 18881ba..430f600 100644 --- a/WebAPI/Controllers/Pay_ReportController.cs +++ b/WebAPI/Controllers/Pay_ReportController.cs @@ -368,5 +368,231 @@ return objJsonResult; } #endregion + + + #region [杞﹂棿璁′欢宸ヨ祫姹囨�籡 + [Route("Pay_PaymentPieceSumReport/list")] + [HttpGet] + public object Pay_PaymentPieceSumReport(int HYear, int HPeriod, int DeptID, string user) + { + List<object> columnNameList = new List<object>(); + try + { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Pay_PaymentPieceSumReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Pay_PaymentPieceSumReport '" + HYear + "','" + HPeriod + "','" + DeptID + "'", "h_p_Pay_PaymentPieceSumReport"); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + 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_PaymentTimeSumReport/list")] + [HttpGet] + public object Pay_PaymentTimeSumReport(int HYear, int HPeriod, int DeptID,int HEmpID,string user) + { + List<object> columnNameList = new List<object>(); + try + { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Pay_PaymentTimeSumReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Pay_PaymentTimeSumReport '" + HYear + "', '" + HPeriod + "','" + DeptID + "','" + HEmpID + "'", "h_p_Pay_PaymentTimeSumReport"); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + 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_PaymentMonthSumReport/list")] + [HttpGet] + public object Pay_PaymentMonthSumReport(int HYear, int HPeriod, int DeptID,int HGroupID,int HEmpID, string user) + { + List<object> columnNameList = new List<object>(); + try + { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Pay_PaymentMonthSumReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Pay_PaymentMonthSumReport '" + HYear + "','" + HPeriod + "','" + DeptID + "','" + HGroupID + "','" + HEmpID + "'", "h_p_Pay_PaymentMonthSumReport"); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + 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_PayWorkShopSumReport/list")] + [HttpGet] + public object Pay_PayWorkShopSumReport(int HYear, int HPeriod, int DeptID,int HEmpID, string user) + { + List<object> columnNameList = new List<object>(); + try + { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Pay_PayWorkShopSumReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Pay_PayWorkShopSumReport '" + HYear + "','" + HPeriod + "','" + DeptID + "','" + HEmpID + "'", "h_p_Pay_PayWorkShopSumReport"); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + 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_PaymentDayCheckReport/list")] + [HttpGet] + public object Pay_PaymentDayCheckReport(int HYear, int HPeriod, int DeptID,int HGroupID, int HEmpID, string user) + { + List<object> columnNameList = new List<object>(); + try + { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Pay_PaymentDayCheckReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Pay_PaymentDayCheckReport '" + HYear + "','" + HPeriod + "','" + DeptID + "','" + HGroupID + "','" + HEmpID + "'", "h_p_Pay_PaymentDayCheckReport"); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + 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 } } \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user index 3b30166..aab61f8 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2024-10-25T01:54:06.8572059Z;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> + <History>True|2024-10-25T08:51:46.3066612Z;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>10/25/2024 09:53:32</publishTime> + <publishTime>10/28/2024 16:06:19</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>10/25/2024 09:53:32</publishTime> + <publishTime>10/28/2024 16:06:19</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>10/25/2024 09:53:30</publishTime> + <publishTime>10/28/2024 16:06:16</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>10/25/2024 09:53:30</publishTime> + <publishTime>10/28/2024 16:06:16</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>10/25/2024 09:53:23</publishTime> + <publishTime>10/28/2024 16:06:11</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>10/25/2024 09:53:23</publishTime> + <publishTime>10/28/2024 16:06:11</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>10/25/2024 09:53:25</publishTime> + <publishTime>10/28/2024 16:06:12</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>10/25/2024 09:53:25</publishTime> + <publishTime>10/28/2024 16:06:12</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>10/25/2024 09:53:21</publishTime> + <publishTime>10/28/2024 16:06:09</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>10/25/2024 09:53:21</publishTime> + <publishTime>10/28/2024 16:06:09</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>10/25/2024 09:53:22</publishTime> + <publishTime>10/28/2024 16:06:10</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>10/25/2024 09:53:22</publishTime> + <publishTime>10/28/2024 16:06:10</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>10/25/2024 09:53:22</publishTime> + <publishTime>10/28/2024 16:06:10</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>10/25/2024 09:53:22</publishTime> + <publishTime>10/28/2024 16:06:10</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> - <publishTime>10/25/2024 09:50:38</publishTime> + <publishTime>10/28/2024 16:03:08</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> - <publishTime>10/25/2024 09:50:38</publishTime> + <publishTime>10/28/2024 16:03:08</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> - <publishTime>10/25/2024 09:50:44</publishTime> + <publishTime>10/28/2024 16:03:14</publishTime> </File> <File Include="bin/TopSdk.pdb"> - <publishTime>10/25/2024 09:50:44</publishTime> + <publishTime>10/28/2024 16:03:14</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>10/25/2024 09:54:04</publishTime> + <publishTime>10/28/2024 16:06:59</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>10/25/2024 09:54:04</publishTime> + <publishTime>10/28/2024 16:06:59</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>08/16/2024 16:55:28</publishTime> @@ -495,7 +495,7 @@ <publishTime>04/29/2024 08:30:03</publishTime> </File> <File Include="Web.config"> - <publishTime>10/24/2024 17:40:45</publishTime> + <publishTime>10/25/2024 10:12:36</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Web.config b/WebAPI/Web.config index bee478c..52d6436 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -35,7 +35,7 @@ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�--> <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴--> <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�--> - <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�--> + <add key="surl" value="http://localhost/webs-web/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�--> <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵--> <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�--> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 5bf2ebd..308610c 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> - <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index 66c41eb..743c19a 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index 9b4e624..b648b13 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index 66c41eb..743c19a 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index 9b4e624..b648b13 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ -- Gitblit v1.9.1