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

52
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -298,7 +298,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> Distribute(MaterialTransferDistributeInput input)
public async Task<Entities.Dto.Outputs.Result> Distribute(MaterialTransferDistributeInput input)
{
try
{
@@ -421,7 +421,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
{
@@ -429,7 +429,7 @@ namespace Tnb.WarehouseMgr
InvokeGenPretaskExcute();
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
@@ -439,7 +439,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> DistributeHCC(MaterialTransferDistributeInput input)
public async Task<Entities.Dto.Outputs.Result> DistributeHCC(MaterialTransferDistributeInput input)
{
try
{
@@ -571,7 +571,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
{
@@ -579,7 +579,7 @@ namespace Tnb.WarehouseMgr
InvokeGenPretaskExcute();
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
@@ -645,7 +645,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> DistributeBCK(MaterialTransferDistributeInput input)
public async Task<Entities.Dto.Outputs.Result> DistributeBCK(MaterialTransferDistributeInput input)
{
try
{
@@ -759,7 +759,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
{
@@ -767,7 +767,7 @@ namespace Tnb.WarehouseMgr
InvokeGenPretaskExcute();
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
@@ -910,7 +910,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> DistributeToZCC(MaterialTransferDistributeToZCCInput input)
public async Task<Entities.Dto.Outputs.Result> DistributeToZCC(MaterialTransferDistributeToZCCInput input)
{
s_taskDistributeToZCC.Wait();
@@ -1036,14 +1036,14 @@ namespace Tnb.WarehouseMgr
await _db.Ado.RollbackTranAsync();
Logger.LogError("【DistributeToZCC】" + ex.Message);
Logger.LogError("【DistributeToZCC】" + ex.StackTrace);
throw Oops.Bah(ex.Message);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
finally
{
s_taskDistributeToZCC.Release();
InvokeGenPretaskExcute();
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
@@ -1053,7 +1053,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> CallRackToProductionLine(MaterialTransferCallRackToProductionLineInput input)
public async Task<Entities.Dto.Outputs.Result> CallRackToProductionLine(MaterialTransferCallRackToProductionLineInput input)
{
try
{
@@ -1155,10 +1155,10 @@ namespace Tnb.WarehouseMgr
{
Logger.LogError("【CallRackToProductionLine】" + ex.Message);
Logger.LogError("【CallRackToProductionLine】" + ex.StackTrace);
throw Oops.Bah(ex.Message);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
return await Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
@@ -1168,7 +1168,7 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> RackAndMatByWorkstation(MaterialTransferGetRackAndMatByWorkStationInput input)
public async Task<Entities.Dto.Outputs.Result> RackAndMatByWorkstation(MaterialTransferGetRackAndMatByWorkStationInput input)
{
try
{
@@ -1222,13 +1222,13 @@ namespace Tnb.WarehouseMgr
pairs["details"] = JArray.Parse(JsonConvert.SerializeObject(matCodes));
jArray.Add(pairs);
}
return Task.FromResult(true);
return await ToApiResult(HttpStatusCode.OK, jArray);
}
catch (Exception ex)
{
Logger.LogError("【RackAndMatByWorkstation】" + ex.Message);
Logger.LogError("【RackAndMatByWorkstation】" + ex.StackTrace);
return Oops.Bah(ex.Message);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
}
@@ -1238,7 +1238,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> RackInstock(MaterialTransferRackInstockInput input)
public async Task<Entities.Dto.Outputs.Result> RackInstock(MaterialTransferRackInstockInput input)
{
WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().Where(r => r.carry_code == input.carry_code).FirstAsync();
@@ -1255,11 +1255,11 @@ namespace Tnb.WarehouseMgr
else
{
Logger.LogError($"【RackInstock】当前载具的规格id是{wmsCarryH.carrystd_id} 无法处理此类型的载具！");
return Oops.Bah($"【RackInstock】当前载具的规格id是{wmsCarryH.carrystd_id} 无法处理此类型的载具！");
return await ToApiResult(HttpStatusCode.InternalServerError, $"【RackInstock】当前载具的规格id是{wmsCarryH.carrystd_id} 无法处理此类型的载具！");
}
}
async Task<dynamic> RackInstock_到暂存仓(MaterialTransferRackInstockInput input, WmsCarryH wmsCarryH)
async Task<Entities.Dto.Outputs.Result> RackInstock_到暂存仓(MaterialTransferRackInstockInput input, WmsCarryH wmsCarryH)
{
try
{
@@ -1362,12 +1362,12 @@ namespace Tnb.WarehouseMgr
Logger.LogError("【RackInstock】" + ex.Message);
Logger.LogError("【RackInstock】" + ex.StackTrace);
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, "成功");
}
async Task<dynamic> RackInstock_到缓存仓(MaterialTransferRackInstockInput input, WmsCarryH wmsCarryH)
async Task<Entities.Dto.Outputs.Result> RackInstock_到缓存仓(MaterialTransferRackInstockInput input, WmsCarryH wmsCarryH)
{
try
{
@@ -1421,9 +1421,9 @@ namespace Tnb.WarehouseMgr
Logger.LogError("【RackInstock】" + ex.Message);
Logger.LogError("【RackInstock】" + ex.StackTrace);
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, "成功");
}
/// <summary>