diff --git a/admin.net.pro/Admin.NET/Vistar.Application/SapService/SapService.cs b/admin.net.pro/Admin.NET/Vistar.Application/SapService/SapService.cs index 2712ab1..a5e0dc9 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/SapService/SapService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/SapService/SapService.cs @@ -326,7 +326,7 @@ public class SapService : IDynamicApiController, ITransient foreach (var item in items) { var element = new XElement("item", - new XElement("MATNR", item.Matnr) + new XElement("Matnr", item.Matnr) ); itemElements.Add(element); @@ -367,9 +367,7 @@ public class SapService : IDynamicApiController, ITransient new XElement("Datuv", input.Datuv), new XElement("Lvorm", input.Lvorm), new XElement("Item", - new XElement("item", EcnItem(input.ItemList) - ) ) ) ) diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs index 0bbd5a1..de6fdc2 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs @@ -33,21 +33,21 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient public SqlSugarRepository _obj118Rep; private readonly SysConfigService _sysConfigService; public Common.DataValidationService _dataValidationService; - public SapService.SapService _sapService; - + public SapService.SapService _sapService; + public ChangeNoticeEcnService( SqlSugarRepository obj118Rep, SysConfigService sysConfigService, DataValidationService dataValidationService, SapService.SapService sapService - + ) { _obj118Rep = obj118Rep; _sysConfigService = sysConfigService; _dataValidationService = dataValidationService; _sapService = sapService; - + } /// /// 分页查询变更通知ECN @@ -59,7 +59,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient public async Task> Page(PageChangeNoticeEcnInput input) { var query = await _obj118Rep.AsQueryable() - .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x.deleted == false && x.IsLatestVersion == true) + .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x.deleted == false && x.IsLatestVersion == true && x._System_CurrentStage == "结束") .WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim())) .WhereIF(input.fld004693Range != null && input.fld004693Range.Length == 2, u => u.fld004693 >= input.fld004693Range[0] && u.fld004693 <= input.fld004693Range[1]) .Select() @@ -99,7 +99,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient var apiOutput = await _sapService.SapEcnApi(sapEcnInput); string codeVal = apiOutput.code == "S" ? "成功" : "失败"; var msg = apiOutput.msg; - if (apiOutput.msg == "") + if (apiOutput.msg == "" && apiOutput.code == "S") { msg = "同步成功"; } @@ -133,7 +133,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient [DisplayName("变更通知ECN-批量同步到SAP")] public async Task> BatchSyncToSAP(List input) { - + var SapOutputList = new List(); var Requser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); for (int i = 0; i < input.Count; i++) @@ -162,7 +162,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient var apiOutput = await _sapService.SapEcnApi(sapEcnInput); string codeVal = apiOutput.code == "S" ? "成功" : "失败"; var msg = apiOutput.msg; - if (apiOutput.msg == "") + if (apiOutput.msg == "" && apiOutput.code == "S") { msg = "同步成功"; } @@ -199,7 +199,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient public async Task> TimingSyncToSAP() { var input = await _obj118Rep.AsQueryable() - .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x.deleted == false && x.IsLatestVersion == true && (x.fld005292 == "A" || x.fld005292 == "M")) + .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x._System_CurrentStage == "结束" && x.deleted == false && x.IsLatestVersion == true && x.fld005292 == "A") .ToListAsync(); var SapOutputList = new List(); var Requser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); @@ -229,7 +229,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient var apiOutput = await _sapService.SapEcnApi(sapEcnInput); string codeVal = apiOutput.code == "S" ? "成功" : "失败"; var msg = apiOutput.msg; - if (apiOutput.msg == "") + if (apiOutput.msg == "" && apiOutput.code == "S") { msg = "同步成功"; }