Просмотр исходного кода

屏蔽重新生成工单物料明细。

tangdi 2 лет назад
Родитель
Сommit
a037f7c214

+ 7 - 6
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3378,8 +3378,8 @@ namespace Business.ResourceExamineManagement
             var workOrds = _replenishmentAppService.CalcPriority(mo_Mes_Morders.Select(p => p.morder_no).ToList(), param.factoryId.ToString());
             //var recid = workOrds.Select(c => c.RecID).ToList();
             //清理工单物料明细
-            var delWorkOrddetails = _workOrdDetail.Select(x => workOrds.Select(c => c.RecID).Contains((int)x.WorkOrdMasterRecID) && x.Domain == param.factoryId.ToString());
-            var productStructureMs = _productStructureMaster.Select(x => workOrds.Select(c => c.WorkOrd).Contains(x.ParentItem) && x.Domain == param.factoryId.ToString());
+            //var delWorkOrddetails = _workOrdDetail.Select(x => workOrds.Select(c => c.RecID).Contains((int)x.WorkOrdMasterRecID) && x.Domain == param.factoryId.ToString());
+            //var productStructureMs = _productStructureMaster.Select(x => workOrds.Select(c => c.WorkOrd).Contains(x.ParentItem) && x.Domain == param.factoryId.ToString());
             List<mes_morder> priorityMorderList = new List<mes_morder>();
             foreach (var work in workOrds)
             {
@@ -3555,7 +3555,8 @@ namespace Business.ResourceExamineManagement
                     }
                 }
 
-                List<WorkOrdDetail> mainWorkOrdDetails = new List<WorkOrdDetail>();
+                //暂时屏蔽重新生成工单物料明细
+                /*List<WorkOrdDetail> mainWorkOrdDetails = new List<WorkOrdDetail>();
                 //成品虚拟件对应关系
                 var productOpList = _productStructureOp.Select(x => priorityMorderList.Select(c => c.product_code).Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
                 foreach (var workord in priorityMorderList)
@@ -3617,7 +3618,7 @@ namespace Business.ResourceExamineManagement
                             }
                         }
                     }
-                }
+                }*/
                 //获取工单数据
                 /*var workOrdMasters = _workOrdMaster.Select(p => mo_Mes_Morders.Select(c => c.morder_no).Contains(p.WorkOrd) && p.Domain == param.factoryId.ToString());
                 workOrdMasters.ForEach(s => {
@@ -3655,14 +3656,14 @@ namespace Business.ResourceExamineManagement
                             srmpooccupyInsert.ForEach(x => { x.GenerateNewId(help.NextId()); });
                             _businessDbContext.BulkInsert(srmpooccupyInsert);
                         }
-                        if (delWorkOrddetails.Any())
+                        /*if (delWorkOrddetails.Any())
                         {
                             _businessDbContext.BulkDelete(delWorkOrddetails);
                         }
                         if (mainWorkOrdDetails.Any())
                         {
                             _businessDbContext.BulkInsert(mainWorkOrdDetails);
-                        }
+                        }*/
                         await unitOfWork.CompleteAsync();
                     }
                     catch (Exception e)