Переглянути джерело

房间号排序

金隅分支
zhangli 3 роки тому
джерело
коміт
6524a3702f
2 змінених файлів з 8 додано та 5 видалено
  1. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js
  2. +5
    -4
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs

+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js Переглянути файл

@@ -131,7 +131,9 @@ var bootstrap = function ($, learun) {
], ],
mainId:'RId', mainId:'RId',
isPage: true
isPage: true,
sidx: 'RCode',
sord: 'ASC'
}); });
page.search(); page.search();
}, },


+ 5
- 4
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs Переглянути файл

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
} }
if (!queryParam["StorageId"].IsEmpty()) if (!queryParam["StorageId"].IsEmpty())
{ {
dp.Add("StorageId",queryParam["StorageId"].ToString(), DbType.String);
dp.Add("StorageId", queryParam["StorageId"].ToString(), DbType.String);
strSql.Append(" AND t.StorageId = @StorageId "); strSql.Append(" AND t.StorageId = @StorageId ");
} }
if (!queryParam["RFunction"].IsEmpty()) if (!queryParam["RFunction"].IsEmpty())
@@ -71,7 +71,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
dp.Add("RArea", "%" + queryParam["RArea"].ToString() + "%", DbType.String); dp.Add("RArea", "%" + queryParam["RArea"].ToString() + "%", DbType.String);
strSql.Append(" AND t.RArea Like @RArea "); strSql.Append(" AND t.RArea Like @RArea ");
} }
return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(strSql.ToString(),dp, pagination);
return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(strSql.ToString(), dp, pagination);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -109,7 +109,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
} }
} }
} }
/// <summary> /// <summary>
/// 获取树形数据 /// 获取树形数据
/// </summary> /// </summary>
@@ -144,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
try try
{ {
string sql = $"select RId,RCode+'('+RFunction+')' as RCode from Ass_Storage_Room where StorageId='{storageId}'"; string sql = $"select RId,RCode+'('+RFunction+')' as RCode from Ass_Storage_Room where StorageId='{storageId}'";
sql += " order by RCode";
return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(sql); return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(sql);
} }
catch (Exception ex) catch (Exception ex)
@@ -170,7 +171,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
{ {
try try
{ {
this.BaseRepository().Delete<Ass_Storage_RoomEntity>(t=>t.RId == keyValue);
this.BaseRepository().Delete<Ass_Storage_RoomEntity>(t => t.RId == keyValue);
} }
catch (Exception ex) catch (Exception ex)
{ {


Завантаження…
Відмінити
Зберегти