From a2f847205e5f60ac31cec6b1b148b9c3ed30c9f1 Mon Sep 17 00:00:00 2001
From: chenwenkai <1084072318@qq.com>
Date: Mon, 11 Nov 2024 09:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 75 ++++++++++++++-------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index bf221193..3ac55f66 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -433,44 +433,46 @@ 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();
-                    if (CheckTaskInput.result == "no")
+                    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 ? "首检不合格" : "末检不合格";
+                    await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
                     {
-                        string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
-                        await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
-                        {
-                            TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
-                            Behavior = "Pause",
-                            PauseReeson = pauseReason
-                        },db);
+                        TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
+                        Behavior = "Pause",
+                        PauseReeson = pauseReason
+                    }, db);
 
-                        #region 没看懂逻辑，暂时注释
-                        //await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
-                        //{
-                        //    mo_task_id = prdMoTask.id,
-                        //    scrap_qty = rqty,
-                        //    remark = "抽样不合格报废",
-                        //    categoryItems = new List<SelfTestScrappedInputItem>()
-                        //    {
-                        //        new SelfTestScrappedInputItem()
-                        //        {
-                        //            category_id = "25574005966629",
-                        //            items = new List<defectItem>()
-                        //            {
-                        //                new defectItem()
-                        //                {
-                        //                    defective_item = "抽样不合格报废",
-                        //                    defective_item_qty = rqty
-                        //                }
-                        //            }
-                        //        }
-                        //    }
-                        //}, db);
-                        #endregion
+                    #region 没看懂逻辑，暂时注释
+                    //await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
+                    //{
+                    //    mo_task_id = prdMoTask.id,
+                    //    scrap_qty = rqty,
+                    //    remark = "抽样不合格报废",
+                    //    categoryItems = new List<SelfTestScrappedInputItem>()
+                    //    {
+                    //        new SelfTestScrappedInputItem()
+                    //        {
+                    //            category_id = "25574005966629",
+                    //            items = new List<defectItem>()
+                    //            {
+                    //                new defectItem()
+                    //                {
+                    //                    defective_item = "抽样不合格报废",
+                    //                    defective_item_qty = rqty
+                    //                }
+                    //            }
+                    //        }
+                    //    }
+                    //}, 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
                     {