提交

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -291,11 +291,11 @@ namespace Business.ResourceExamineManagement
                             Domain = param.factoryId.ToString()
                         };
                         int make_time = _productExamineAppService.ProductTime(prodExamine);
-                        if (make_time < level1Dto.PurLT)
+                        /*if (make_time < level1Dto.PurLT)
                         {
                             //如果生产时长小于供应提前期，则按供应提前期算
                             make_time = level1Dto.PurLT;
-                        }
+                        }*/
                         //根据成品属性来判断是自制还是委外还是外购，需要考虑这种场景
                         if (level1Dto.erp_cls == 1 && param.checkflag)
                         {
@@ -777,11 +777,11 @@ namespace Business.ResourceExamineManagement
                                 Domain = param.factoryId.ToString()
                             };
                             int make = _productExamineAppService.ProductTime(prodExamine);
-                            if (make < item.PurLT)
+                            /*if (make < item.PurLT)
                             {
                                 //如果生产时长小于供应提前期，则按供应提前期算
                                 make = item.PurLT;
-                            }
+                            }*/
                             item.make_qty = item.lack_qty;
                             if (mes_MorderDto != null)
                             {
@@ -1331,11 +1331,11 @@ namespace Business.ResourceExamineManagement
                                         Domain = param.factoryId.ToString()
                                     };
                                     int make = _productExamineAppService.ProductTime(prodExamine);
-                                    if (make < sct.PurLT)
+                                    /*if (make < sct.PurLT)
                                     {
                                         //如果生产时长小于供应提前期，则按供应提前期算
                                         make = sct.PurLT;
-                                    }
+                                    }*/
                                     sct.make_qty = sct.lack_qty;
                                     if (mes_MorderDto != null)
                                     {

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

@@ -4846,7 +4846,7 @@ namespace Business.ResourceExamineManagement
                             var dtls = subDetalis.Where(s => s.substitute_group_id == g.Id).ToList();
                             foreach (var dtl in dtls)
                             {
-                                var l = list.Find(s => s.item_number == dtl.icitem_number && s.qty == dtl.replace_qty);
+                                var l = list.Find(s => s.item_number == dtl.icitem_number);
                                 if (l == null)
                                 {
                                     return "当前替代方案【" + code + "】的标准件未找到相同数量相同物料的BOM明细。";