diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs index bd6bbdd..1e3a929 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs @@ -12,6 +12,7 @@ using Furion.DynamicApiController; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using SqlSugar; using System; using System.Collections.Generic; using System.ComponentModel; @@ -579,6 +580,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient return SapOutputList; } + /// /// 产品设计库-定时同步 BOM 到 SAP /// @@ -1038,7 +1040,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient { return "请输入父项编码"; } - var parentData = await _obj137Rep.AsQueryable().Where(x => x._System_objNBS == input.ParentCode && x.deleted == false).OrderByDescending(x => x.idRecord).FirstAsync(); + var parentData = await _obj137Rep.AsQueryable().Where(x => x._System_objNBS == input.ParentCode && x.deleted == false && x._system_objConfigurationName == "默认").OrderByDescending(x => x.idRecord).FirstAsync(); if (parentData == null) { return "父项编码不存在,请检查"; @@ -1047,7 +1049,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient { return "不在设计或工艺阶段不允许添加"; } - var bom = await _configurationDataRep.AsQueryable().Where(x => x.ParentGuid == parentData.RecordGuid && x.isDeleted == false && x.ParentVersion == parentData.VersionIndex&&x.ConfigId==8).ToListAsync(); + var bom = await _configurationDataRep.AsQueryable().Where(x => x.ParentGuid == parentData.RecordGuid && x.isDeleted == false && x.ParentVersion == parentData.VersionIndex && x.ConfigId == 8 && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); if (bom.Count != 0) { return "编码已存在原材料不允许修改"; @@ -1061,7 +1063,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient output = outputData + "未输入必填项"; continue; } - if (item.Quantity==0) + if (item.Quantity == 0) { output = outputData + "请输入数量"; continue;