diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductionMaterialsManagement/ProductionMaterialsManagementService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductionMaterialsManagement/ProductionMaterialsManagementService.cs index 8e0266a..7448c01 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductionMaterialsManagement/ProductionMaterialsManagementService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductionMaterialsManagement/ProductionMaterialsManagementService.cs @@ -59,7 +59,7 @@ public class ProductionMaterialsManagementService : IDynamicApiController, ITran public async Task> Page(PageProductionMaterialsManagementInput input) { var query = await _obj112Rep.AsQueryable() - .Where(x => x.CheckedStatus == 7 && x.deleted == false && x.IsLatestVersion == true && x.fld004973=="发布") + .Where(x => (x.CheckedStatus == 7 || x.CheckedStatus == 8) && x.deleted == false && x.IsLatestVersion == true && x.fld004973 == "发布") .WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.fld004598), u => u.fld004598.Contains(input.fld004598.Trim())) .WhereIF(input.fld004609Range != null && input.fld004609Range.Length == 2, u => u.fld004609 >= input.fld004609Range[0] && u.fld004609 <= input.fld004609Range[1]) @@ -204,7 +204,7 @@ public class ProductionMaterialsManagementService : IDynamicApiController, ITran }); continue; } - if (input[i].fld004607 != "A" || input[i].fld004607 != "M" || input[i].fld004607 == null) + if (input[i].fld004607 != "A" || input[i].fld004607 != "M" || input[i].fld004607 == null) { SapOutputList.Add(new SapOutput() { @@ -292,7 +292,7 @@ public class ProductionMaterialsManagementService : IDynamicApiController, ITran public async Task> TimingSyncToSAP() { var input = await _obj112Rep.AsQueryable() - .Where(x => x.CheckedStatus == 7 && x.deleted == false && x.IsLatestVersion == true&&(x.fld004607=="A"||x.fld004607 == "M") && x.fld004973 == "发布") + .Where(x => (x.CheckedStatus == 7 || x.CheckedStatus == 8) && x.deleted == false && x.IsLatestVersion == true && (x.fld004607 == "A" || x.fld004607 == "M") && x.fld004973 == "发布") .ToListAsync(); const string lengthError = "物料描述长度大于40,请检查!"; var SapOutputList = new List();