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-06-26 16:56:52 +08:00
parent ade240d8cf
commit c1c9000e0c
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -599,9 +599,9 @@ namespace Tnb.WarehouseMgr
}
catch (Exception ex)
{
Logger.Error("【TaskCallback】 任务状态上报出现错误", ex);
Logger.Error("【TaskCallback】 任务状态上报出现错误", ex.Message);
Logger.Error("【TaskCallback】 任务状态上报错误堆栈信息", ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！" + ex.Message);
throw;
}
finally

2
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -2810,8 +2810,6 @@ namespace Tnb.WarehouseMgr
var db = _db;
if (dbConn != null)
db = dbConn;
else
db = _db.CopyNew();
{

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

@@ -467,16 +467,16 @@ namespace Tnb.WarehouseMgr
// 获取任务单
List<PrdMoTask> organizeEntityCXs = _db.Queryable<PrdMoTask>().Where(r => r.workline_id == organizeEntityCX.Id && r.mo_task_status == DictConst.InProgressEnCode).ToList();
List<PrdMoTask> organizeEntityCXs = _db.Queryable<PrdMoTask>().Where(r => r.workline_id == organizeEntityCX.Id && r.mo_task_status == DictConst.InProgressEnCode && !string.IsNullOrEmpty(r.parent_id)).ToList();
if (organizeEntityCXs.Count > 1)
{
Logger.LogWarning($"【DistributeHCC】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一，请检查！");
Logger.LogWarning($"【DistributeHCC】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一(需要有parentid)，请检查！");
throw new AppFriendlyException($"【DistributeHCC】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一，请检查！", 500);
}
if (organizeEntityCXs.Count == 0)
{
Logger.LogWarning($"【DistributeHCC】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单，请检查！");
throw new AppFriendlyException($"【DistributeHCC】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单，请检查！", 500);
Logger.LogWarning($"【DistributeHCC】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单(需要有parentid，请检查！");
throw new AppFriendlyException($"【DistributeHCC】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单)，请检查！", 500);
}
PrdMoTask prdMoTask = organizeEntityCXs.First();
@@ -782,15 +782,15 @@ namespace Tnb.WarehouseMgr
// 获取任务单
List<PrdMoTask> organizeEntityCXs = _db.Queryable<PrdMoTask>().Where(r => r.workline_id == organizeEntityCX.Id && r.mo_task_status == DictConst.InProgressEnCode).ToList();
List<PrdMoTask> organizeEntityCXs = _db.Queryable<PrdMoTask>().Where(r => r.workline_id == organizeEntityCX.Id && r.mo_task_status == DictConst.InProgressEnCode && !string.IsNullOrEmpty(r.parent_id)).ToList();
if (organizeEntityCXs.Count > 1)
{
Logger.LogWarning($"【CallRackToProductionLine】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一，请检查！");
Logger.LogWarning($"【CallRackToProductionLine】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一(需要有parentid)，请检查！");
throw new AppFriendlyException($"【CallRackToProductionLine】工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单不唯一，请检查！", 500);
}
if (organizeEntityCXs.Count == 0)
{
Logger.LogWarning($"【CallRackToProductionLine】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单，请检查！");
Logger.LogWarning($"【CallRackToProductionLine】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单(需要有parentid)，请检查！");
throw new AppFriendlyException($"【CallRackToProductionLine】未找到工位{organizeEntity.EnCode}的上级{organizeEntityCX.EnCode}对应的进行中的任务单，请检查！", 500);
}
PrdMoTask prdMoTask = organizeEntityCXs.First();