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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
alex
2023-07-13 14:13:22 +08:00
parent 7cf869b6f2 adbef09153
commit f9343d27c4
12 changed files with 204 additions and 143 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)
{
if (input.IsNull()) throw new ArgumentNullException("input");
var results = new List<CarryQueryOutput>();
var data = new List<CarryQueryOutput>();
try
{
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))
.ToListAsync();
results = carrys.Adapt<List<CarryQueryOutput>>();
data = carrys.Adapt<List<CarryQueryOutput>>();
}
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);
}
/// <summary>
/// 载具查询返回接口
@@ -64,13 +64,13 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
var result = new CarryQueryOutput();
var data = new CarryQueryOutput();
try
{
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();
result = carry.Adapt<CarryQueryOutput>();
result.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();
data = carry.Adapt<CarryQueryOutput>();
data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();
}
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);
}
}
}