From c3081ad45da5ac35adc505d1cc3871b91651849f Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期五, 15 八月 2025 13:49:18 +0800 Subject: [PATCH] 派工单查询按客户区分条件; --- WebAPI/Controllers/LMESController.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index 1187096..ba026b1 100644 --- a/WebAPI/Controllers/LMESController.cs +++ b/WebAPI/Controllers/LMESController.cs @@ -372,11 +372,11 @@ sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("exec h_p_ProcessExchangeBillCheckRecordListPage " + page + "," + size + "," + "''", "h_p_Sc_ProcessExchangeBillList_Query"); + ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillCheckRecordListPage " + page + "," + size + "," + "''", "h_p_Sc_ProcessExchangeBillList_Query"); } else { - ds = oCN.RunProcReturn("exec h_p_ProcessExchangeBillCheckRecordListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_Query"); + ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillCheckRecordListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_Query"); } //娣诲姞鍒楀悕 @@ -584,6 +584,7 @@ public object MES_ProcessExchangeBillList_PG(string sWhere, string user, int OperationType) { DataSet ds; + string sql = ""; try { List<object> columnNameList = new List<object>(); @@ -597,6 +598,8 @@ return objJsonResult; } + sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere + " order by hmainid desc "; + if (OperationType == 1) { //鑾峰彇绯荤粺鍙傛暟 @@ -609,6 +612,10 @@ sWhere += " "; } + else if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒") + { + sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere; + } else { sWhere += " "; @@ -616,7 +623,7 @@ } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeArrangementList_PG"); + ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeArrangementList_PG"); } else { @@ -630,10 +637,14 @@ } + else if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒") + { + sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere; + } } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere, "h_v_Sc_ProcessExchangeArrangementList_PG"); + ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeArrangementList_PG"); } //娣诲姞鍒楀悕 @@ -4188,5 +4199,36 @@ } } #endregion + + #region 鏇存柊app + /// <summary> + ///鍙傛暟锛歴tring HInterID銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("LMES/AppUpdate")] + [HttpGet] + public object AppUpdate(string Type) + { + try + { + DataSet ds; + ds = oCN.RunProcReturn("exec h_p_Gy_APPUpdateInformation " + Type , "h_p_Gy_APPUpdateInformation"); + + 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 } } \ No newline at end of file -- Gitblit v1.9.1