diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 123e9d39..0259c69b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -36,7 +36,7 @@ namespace Tnb.WarehouseMgr public async Task MESCarryQuery(MESCarryQueryInput input) { if (input.IsNull()) throw new ArgumentNullException("input"); - var results = new List(); + var data = new List(); try { var carrys = await _db.Queryable() @@ -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)) .ToListAsync(); - results = carrys.Adapt>(); + data = carrys.Adapt>(); } catch (Exception ex) @@ -52,7 +52,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.RollbackTranAsync(); return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); } - return ToApiResult(results); + return ToApiResult(data); } /// /// 载具查询返回接口 @@ -64,13 +64,13 @@ namespace Tnb.WarehouseMgr public async Task MESCarryQueryResult(MESCarryQueryResultInput input) { if (input.IsNull()) throw new ArgumentNullException("input"); - var result = new CarryQueryOutput(); + var data = new CarryQueryOutput(); try { var carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code); var carryCodes = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); - result = carry.Adapt(); - result.wmsCarryCodes = carryCodes.Adapt>(); + data = carry.Adapt(); + data.wmsCarryCodes = carryCodes.Adapt>(); } catch (Exception ex) @@ -78,7 +78,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.RollbackTranAsync(); 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); } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs index 116b46db..4aa97494 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs @@ -92,10 +92,10 @@ namespace Tnb.WarehouseMgr public async Task MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input) { if (input.IsNull()) throw new ArgumentNullException("input"); - var results = new List(); + var data = new List(); try { - results = await _db.Queryable() + data = await _db.Queryable() .Where(a => a.material_id == input.material_id) .Select(a => new CollocationSchemeOutput { @@ -108,7 +108,7 @@ namespace Tnb.WarehouseMgr { return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); } - return await ToApiResult(results); + return await ToApiResult(data); } } }