Procházet zdrojové kódy

替代料兼容报错问题解决。

tangdi před 2 roky
rodič
revize
57e54e8c00

+ 5 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -224,8 +224,11 @@ namespace Business.ResourceExamineManagement
                                 childidList.AddRange(returnlist.Where(s => s.substitute_code == item.substitute_code).Select(d => d.bom_child_id.GetValueOrDefault()));
                                 childidList.AddRange(returnlist.Where(s => s.substitute_code == item.substitute_code).Select(d => d.bom_child_id.GetValueOrDefault()));
                                 //将主料赋值上属性
                                 //将主料赋值上属性
                                 var dtlitem = returnlist.Find(s => s.item_id == dtl.icitem_id && s.level == item.level);
                                 var dtlitem = returnlist.Find(s => s.item_id == dtl.icitem_id && s.level == item.level);
-                                dtlitem.substitute_all_num = sal.order_num;//群组优先级
-                                dtlitem.haveicsubs = 1;
+                                if (dtlitem != null)
+                                {
+                                    dtlitem.substitute_all_num = sal.order_num;//群组优先级
+                                    dtlitem.haveicsubs = 1;
+                                }
                             }
                             }
                         }
                         }
                     }
                     }

+ 12 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -5056,7 +5056,8 @@ namespace Business.ResourceExamineManagement
                         }
                         }
                     }
                     }
                 }
                 }
-                await _businessDbContext.BulkUpdateAsync(list);
+                //await _businessDbContext.BulkUpdateAsync(list);
+                _businessDbContext.ic_bom_child.UpdateRange(list);
             }
             }
             return "ok";
             return "ok";
         }
         }
@@ -5089,8 +5090,16 @@ namespace Business.ResourceExamineManagement
                     {
                     {
                         await _businessDbContext.BulkDeleteAsync(refBomList);
                         await _businessDbContext.BulkDeleteAsync(refBomList);
                     }
                     }
-                    var boms = _ic_bom.GetListAsync(s => refList.Select(c => c.sourceid).Contains(s.Id)).Result;
-                    if (boms.Any()) {
+                    var boms = _ic_bom.GetListAsync(s => refList.Select(c => c.sourceid).Contains(s.mysql_id)).Result;
+                    if (boms.Any())
+                    {
+                        AutoCreateBomBill(dto.company_id.ToString(), boms);
+                    }
+                }
+                else {
+                    var boms = _ic_bom.GetListAsync(s => s.mysql_id== dto.id).Result;
+                    if (boms.Any())
+                    {
                         AutoCreateBomBill(dto.company_id.ToString(), boms);
                         AutoCreateBomBill(dto.company_id.ToString(), boms);
                     }
                     }
                 }
                 }