From 6f5f4082f2484b426796bc0f31f7bdb1573f0387 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 14 Jun 2022 17:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E7=AE=A1=E7=90=86--=E5=BA=8A?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=BA=8A?=
 =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0DNo=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AccommodationController.cs                 | 7 ++++++-
 .../Areas/LogisticsManagement/Views/Accommodation/Index.js | 2 +-
 .../LogisticsManagement/Views/Accommodation/IndexBed.js    | 2 +-
 .../Views/Accommodation/IndexDistribution.js               | 2 +-
 .../Learun.Application.Web/Learun.Application.Web.csproj   | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

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);
         }
         /// <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("保存成功！");
         }
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 @@
     <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>