宿舍管理--床位排序修改，床位管理新增编辑更新DNo字段

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);
         }
         /// <summary>
@@ -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<Acc_DormitoryBuildEntity>();
+            if (entity.Name.Contains("床"))
+            {
+                entity.DNo = entity.Name.Replace("床", "");
+            }
+
             accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity);
             return Success("保存成功！");
         }

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;

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();

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 || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -7775,6 +7775,8 @@
     <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile7.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
     <Content Include="Views\Utility\ListContentIndexLost.cshtml" />
   </ItemGroup>