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-11-11 09:10:26 +08:00
parent 8e8c37488a
commit a2f847205e
1 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -433,7 +433,7 @@ namespace Tnb.QcMgr
}
}else if (QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID )
{
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x=>x.mo_task_code==QcCheckExecH.mo_task_code && x.id!=null).FirstAsync();
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x => x.mo_task_code == QcCheckExecH.mo_task_code && x.id != null).FirstAsync();
if (CheckTaskInput.result == "no")
{
string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
@@ -442,7 +442,7 @@ namespace Tnb.QcMgr
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Pause",
PauseReeson = pauseReason
},db);
}, db);
#region 没看懂逻辑，暂时注释
//await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
@@ -468,9 +468,11 @@ namespace Tnb.QcMgr
//}, db);
#endregion
List<PrdReport> prdReports= await db.Queryable<PrdReport>().Where(x => x.mo_task_id == prdMoTask.id && x.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && x.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime()).ToListAsync();
//List<string> carryCodes = await db.Queryable<PrdReport>().Where(x => x.mo_task_id == prdMoTask.id && x.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && x.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime()).Select(x => x.material_box_code).Distinct().ToListAsync();
var carryCodes= prdReports.Select(r=>r.material_box_code).Distinct().ToList();
//载具需要在中储仓和暂存仓才需要暂控
List<PrdReport> prdReports = await db.Queryable<PrdReport>().LeftJoin<WmsCarryH>((a, b) => a.material_box_code == b.carry_code).LeftJoin<BasLocation>((a, b, c) => b.location_id == c.id).LeftJoin<BasWarehouse>((a, b, c, d) => c.wh_id == d.id).Where((a, b, c, d) => a.mo_task_id == prdMoTask.id && a.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && a.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime() && (c.wh_id == WmsWareHouseConst.WAREHOUSE_ZC_ID || c.wh_id == WmsWareHouseConst.WAREHOUSE_ZCC_ID)).ToListAsync();
if (prdReports != null)
{
var carryCodes = prdReports.Select(r => r.material_box_code).Distinct().ToList();
if (carryCodes != null && carryCodes.Count > 0)
{
await db.Updateable<WmsCarryH>()
@@ -512,7 +514,7 @@ namespace Tnb.QcMgr
#region 记录暂控处理单主/子表信息
if(carryCodes!=null && carryCodes.Count > 0)
if (carryCodes != null && carryCodes.Count > 0)
{
var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync();
@@ -594,7 +596,6 @@ namespace Tnb.QcMgr
}
#endregion
}
}
else
{