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

电梯下发逻辑变更

Browse Source
This commit is contained in:
马健
2024-07-17 22:50:24 +08:00
parent c6ae917bc9
commit 019651b023
10 changed files with 246 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs
View File

@@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> Distribute(SaleReleaseDistributeInput input)
public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> Distribute(SaleReleaseDistributeInput input)
{
Logger.LogInformation($"【Distribute】 销售出库下发");
try
@@ -163,7 +163,7 @@ namespace Tnb.WarehouseMgr
await s_taskExecuteSemaphore.WaitAsync();
await _db.Ado.BeginTranAsync();
//入库取终点 //出库起点
OutStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, material_id = wmsOutstockD.material_id, qty = input.qty, code_batch = wmsOutstockD.code_batch };
OutStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, material_id = wmsOutstockD.material_id, qty = input.qty, code_batch = wmsOutstockD.code_batch };
List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items = await _wareHouseService.OutStockStrategy_saleRelease(inStockStrategyInput);
decimal canOutstockQty = items.Sum(r => r.Item3.codeqty).ParseToDecimal();
@@ -359,7 +359,7 @@ namespace Tnb.WarehouseMgr
await _db.Ado.RollbackTranAsync();
Logger.LogError($"【Distribute】 销售出库 {ex.Message}");
Logger.LogError($"【Distribute】 销售出库 {ex.StackTrace}");
throw Oops.Bah(ex.Message);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
finally
{
@@ -367,7 +367,7 @@ namespace Tnb.WarehouseMgr
await InvokeGenPretaskExcute();
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
@@ -376,7 +376,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> Sort(FinishproductOutstockSortInput input)
public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> Sort(FinishproductOutstockSortInput input)
{
if (string.IsNullOrEmpty(input.source_id))
{
@@ -413,10 +413,14 @@ namespace Tnb.WarehouseMgr
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
throw Oops.Bah(ex.Message);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
}
}