diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs index 24e3ad8cf..cecc6a18d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs @@ -243,7 +243,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult GetBedListByRoomId(string RoomId) { - var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); + var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => Convert.ToInt32(x.DNo)); return Success(data); } /// @@ -434,6 +434,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) { Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + if (entity.Name.Contains("床")) + { + entity.DNo = entity.Name.Replace("床", ""); + } + accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); return Success("保存成功!"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js index 490719349..162af9682 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js @@ -455,7 +455,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: false, - sidx: ' REPLACE(Name,\'床\',\'\')' + sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' //sord: 'ASC', }); //var param; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js index 218d9e18e..0cb2af6f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js @@ -85,7 +85,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: false, - sidx: ' REPLACE(Name,\'床\',\'\')' + //sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js index 2e72dd9af..ad35ac2ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js @@ -490,7 +490,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: false, - sidx: ' REPLACE(Name,\'床\',\'\')' + //sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' }); //var param; //param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index c635205cf..78b3fd178 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -7775,6 +7775,8 @@ + +