diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index 45287ded..5f5d2c05 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -1004,7 +1004,16 @@ namespace Tnb.ProductionMgr
                 var taskReportLogs = new List<PrdMoTask>();
                 var prdTaskList = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).ToListAsync();
                 if (prdTaskList?.Count > 0)
-                {
+                {   
+                    /*
+                    if (prdTaskList.Where(p => p.mo_task_status == "Closed").Count() > 0 && status == "InProgress")
+                    {
+                        foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Closed").ToList())
+                        {
+                    //质检
+                        }
+                    }
+                    */
                     prdTaskList.ForEach(x => x.mo_task_status = status);
                     row = await db.Updateable(prdTaskList).ExecuteCommandAsync();
                     if (row > 0)
diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
index 5ec7522e..5717a3f5 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -303,6 +303,8 @@ namespace Tnb.QcMgr
                 TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "首件检").First().Id && p.name == "生产任务暂停").First();
             if (enumTriggerEvent == EnumTriggerEvent.出厂检按入厂频次)
                 TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "出厂检").First().Id && p.name == "按入厂频次").First();
+            if (enumTriggerEvent == EnumTriggerEvent.入厂检按物料频次)
+                TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "入厂检").First().Id && p.name == "按物料频次").First();
             if (enumTriggerEvent == EnumTriggerEvent.入厂检按物料编号)
                 TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "入厂检").First().Id && p.name == "按物料编号").First();
             if (enumTriggerEvent == EnumTriggerEvent.生产检定量)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index 1e6c5334..d6c26e3a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -368,16 +368,17 @@ namespace Tnb.WarehouseMgr
                 {
                     List<WmsCarryMat> carryMats = new();
                     List<WmsCarryCode> carryCodes = new();
-                    var whereExp = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
-                                   .And((a, b, c) => a.is_lock == 0)
-                                   .And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
-                                   .And((a, b, c) => a.status == (int)EnumCarryStatus.占用)
-                                   .And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString());
+
 
                     foreach (var os in outStockDList)
                     {
-                        whereExp.And((a, b, c) => b.material_id == os.material_id)
-                                .AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch);
+                        var whereExp = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
+                                   .And((a, b, c) => a.is_lock == 0)
+                                   .And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
+                                   .And((a, b, c) => a.status == (int)EnumCarryStatus.占用)
+                                   .And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
+                                   .And((a, b, c) => b.material_id == os.material_id)
+                                   .AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch);
 
                         var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
                                                   .Where(whereExp.ToExpression())