|
|
@@ -3663,18 +3663,12 @@ namespace Business.ResourceExamineManagement
|
|
|
List<b_bom_pretreatment> addList = new List<b_bom_pretreatment>();
|
|
|
foreach (var bom in ic_Boms)
|
|
|
{
|
|
|
- /*var pret = pretreatment.Find(s => s.sourceid == bom.mysql_id && s.bom_id == bom.mysql_id);
|
|
|
- if (pret != null)
|
|
|
+ var pret = pretreatment.Where(s => s.sourceid == bom.mysql_id).ToList();
|
|
|
+ if (pret.Any())
|
|
|
{
|
|
|
- if (pret.version == bom.version)
|
|
|
- {
|
|
|
- //如果存在,且版本相同,则不需要处理
|
|
|
- continue;
|
|
|
- }
|
|
|
//版本不同则重新生成
|
|
|
- deleteList.Add(pret);
|
|
|
- }*/
|
|
|
- deleteList.AddRange(pretreatment);
|
|
|
+ deleteList.AddRange(pret);
|
|
|
+ }
|
|
|
//bom层级组装
|
|
|
var getBomList = _pretreatmentAppService.BomPretreatment(bom.mysql_id, bomlist, bomchildlist, icitemlist);
|
|
|
//bom替代关系组装
|