|
@@ -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) |
|
|
{ |
|
|
{ |
|
|