质检

QcMgr/Tnb.QcMgr/QcCheckTaskService.cs

@@ -468,8 +468,10 @@ 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();
+                    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)
                         {
@@ -594,7 +596,6 @@ namespace Tnb.QcMgr
                             }
                             #endregion
                         }
-
                     }
                     else
                     {