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:
马健
2024-09-15 00:59:59 +08:00
parent 71f390cade 88941072d9
commit 03ab07ffed
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -129,6 +129,7 @@ namespace Tnb.ProductionMgr
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>(). PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().
LeftJoin<PrdMo>((x,y)=>x.mo_id==y.id) LeftJoin<PrdMo>((x,y)=>x.mo_id==y.id)
.Where(x => x.mo_task_status==DictConst.InProgressEnCode) .Where(x => x.mo_task_status==DictConst.InProgressEnCode)
.Where((x, y) => x.schedule_type==1 || (x.schedule_type==2 && x.parent_id!=null))
.Where((x,y)=>(x.scheduling_class_type=="1" && twoDayFlag && x.dayshift_worker_id==userId) .Where((x,y)=>(x.scheduling_class_type=="1" && twoDayFlag && x.dayshift_worker_id==userId)
|| (y.mo_type==DictConst.PrdMoTypeBZ && !SqlFunc.IsNullOrEmpty(userWorklineId) && x.workline_id==userWorklineId) || (y.mo_type==DictConst.PrdMoTypeBZ && !SqlFunc.IsNullOrEmpty(userWorklineId) && x.workline_id==userWorklineId)
|| (x.scheduling_class_type=="1" && twoNightFlag && x.nightshift_worker_id==userId) || (x.scheduling_class_type=="1" && twoNightFlag && x.nightshift_worker_id==userId)
@@ -151,6 +152,30 @@ namespace Tnb.ProductionMgr
{ {
throw Oops.Bah($"未找到该载具{qrCode}"); throw Oops.Bah($"未找到该载具{qrCode}");
} }
List<PrdMoTask> inPrdMoTask = await db.Queryable<PrdMoTask>().
LeftJoin<PrdMo>((x,y)=>x.mo_id==y.id)
.Where(x => x.mo_task_status==DictConst.InProgressEnCode)
.Where((x, y) => x.schedule_type==1 || (x.schedule_type==2 && x.parent_id!=null))
.Where((x,y)=>(x.scheduling_class_type=="1" && twoDayFlag && x.dayshift_worker_id==userId)
|| (y.mo_type==DictConst.PrdMoTypeBZ && !SqlFunc.IsNullOrEmpty(userWorklineId) && x.workline_id==userWorklineId)
|| (x.scheduling_class_type=="1" && twoNightFlag && x.nightshift_worker_id==userId)
|| (x.scheduling_class_type=="2" && fourDayBeforeFlag && x.dayshift_worker_id==userId)
|| (x.scheduling_class_type=="2" && fourDayAfterFlag && x.dayshiftafter_worker_id==userId)
|| (x.scheduling_class_type=="2" && fourNightBeforeFlag && x.nightshift_worker_id==userId)
|| (x.scheduling_class_type=="2" && fourNightAfterFlag && x.nightshiftafter_worker_id==userId))
.ToListAsync();
Log.Information($"生产投料任务单id:${prdMoTask.id}");
Log.Information($"生产投料载具id:${wmsCarryH.id}");
if (!ids.IsEmpty())
{
Log.Information($"生产签收ids:${JsonConvert.SerializeObject(ids)}");
}
if (!inPrdMoTask.IsEmpty())
{
Log.Information($"找到的进行中的任务单:${JsonConvert.SerializeObject(inPrdMoTask)}");
}
if (wmsCarryH.carrystd_id==WmsWareHouseConst.CARRY_ZYXCSTD_ID || wmsCarryH.carrystd_id==WmsWareHouseConst.CARRY_ZYLJSTD_ID) if (wmsCarryH.carrystd_id==WmsWareHouseConst.CARRY_ZYXCSTD_ID || wmsCarryH.carrystd_id==WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {