From da9eb5796450ac85f1338295504a1365a6c37515 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 20 六月 2022 08:56:40 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs index 2f4d238..1ebe765 100644 --- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs @@ -41,13 +41,14 @@ string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 缁勭粐鍚嶇О='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_WareHouseList"); + ds = oCN.RunProcReturn(sql1 + sWhere + " order by 浠撳簱浠g爜 ", "h_v_IF_WareHouseList"); } else { - string sql = sql1 + sWhere + "order by HItemID desc"; + string sql = sql1 + sWhere + " order by 浠撳簱浠g爜 "; ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList"); } + //if (ds == null || ds.Tables[0].Rows.Count == 0) //{ // objJsonResult.code = "0"; -- Gitblit v1.9.1