代码提交

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1557,7 +1557,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //获取订单行数据  progress == "2"已做检查但是未评审的订单行
-            //sentrys = sentrys.Where(s => s.progress == "2").ToList();
+            sentrys = sentrys.Where(s => s.progress == "2").ToList();
             if (!sentrys.Any())
             {
                 new NLogHelper("ResourceExamineAppService").WriteLog("ReceiveResult", "订单行数据不存在", _currentTenant.Id.ToString());
@@ -2860,7 +2860,7 @@ namespace Business.ResourceExamineManagement
                             mo.morder_state = MorderEnum.Xd_state;
                         }
                     }
-                    await _mysql_mes_morder.UpdateManyAsync(morders);
+                    
                     if (workords.Length > 0)
                     {
                         workords = workords.Substring(1, workords.Length - 1);
@@ -2870,6 +2870,7 @@ namespace Business.ResourceExamineManagement
                         {
                             return pickRst;
                         }
+                        await _mysql_mes_morder.UpdateManyAsync(morders);
                         var insertList = GetCopyOP(workords, domain);
                         if (insertList.Any())
                         {
@@ -4068,7 +4069,6 @@ namespace Business.ResourceExamineManagement
                     }
                 }
 
-
                 //清理掉库存占用  这里考虑的是资源检查的占用没有完全占用备料单数据，而其他数据再进行齐套检查时，无法考虑到备料单的占用。
                 var itemstockoccupy = _mysql_ic_item_stockoccupy.GetListAsync(s => workOrdMasters.Select(x => x.WorkOrd).Contains(s.morder_mo) && s.factory_id.ToString() == domain).Result;
                 var icitem = _mysql_ic_item.GetListAsync(s => s.factory_id.ToString() == domain && nbrDetailList.Select(c => c.ItemNum).Contains(s.number)).Result;