wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改返回结果变量名results=>data

Browse Source
This commit is contained in:
FanLian
2023-07-13 09:17:26 +08:00
parent a3e6ba5bb5
commit f474f40135
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
View File

@@ -36,7 +36,7 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input) public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
var results = new List<CarryQueryOutput>(); var data = new List<CarryQueryOutput>();
try try
{ {
var carrys = await _db.Queryable<WmsCarryH>() var carrys = await _db.Queryable<WmsCarryH>()
@@ -44,7 +44,7 @@ namespace Tnb.WarehouseMgr
.Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name)) .Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name))
.ToListAsync(); .ToListAsync();
results = carrys.Adapt<List<CarryQueryOutput>>(); data = carrys.Adapt<List<CarryQueryOutput>>();
} }
catch (Exception ex) catch (Exception ex)
@@ -52,7 +52,7 @@ namespace Tnb.WarehouseMgr
await _db.Ado.RollbackTranAsync(); await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
} }
return ToApiResult(results); return ToApiResult(data);
} }
/// <summary> /// <summary>
/// 载具查询返回接口 /// 载具查询返回接口
@@ -64,13 +64,13 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input) public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
var result = new CarryQueryOutput(); var data = new CarryQueryOutput();
try try
{ {
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code);
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carry.id).ToListAsync(); var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carry.id).ToListAsync();
result = carry.Adapt<CarryQueryOutput>(); data = carry.Adapt<CarryQueryOutput>();
result.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>(); data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();
} }
catch (Exception ex) catch (Exception ex)
@@ -78,7 +78,7 @@ namespace Tnb.WarehouseMgr
await _db.Ado.RollbackTranAsync(); await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
} }
return ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, result); return ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, data);
} }
} }
} }

6
WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
View File

@@ -92,10 +92,10 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input) public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
var results = new List<CollocationSchemeOutput>(); var data = new List<CollocationSchemeOutput>();
try try
{ {
results = await _db.Queryable<WmsCollocationSchemeH>() data = await _db.Queryable<WmsCollocationSchemeH>()
.Where(a => a.material_id == input.material_id) .Where(a => a.material_id == input.material_id)
.Select(a => new CollocationSchemeOutput .Select(a => new CollocationSchemeOutput
{ {
@@ -108,7 +108,7 @@ namespace Tnb.WarehouseMgr
{ {
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
} }
return await ToApiResult(results); return await ToApiResult(data);
} }
} }
} }