接口bug修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs

@@ -165,8 +165,8 @@ public class EosAgentModule : AbpModule
     ApplicationInitializationContext context)
     {
 
-        context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
-      //  context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
+        //context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
+       context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
     }
 
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.BackgroundWorkers;
 using Volo.Abp.Threading;
@@ -54,10 +56,9 @@ public class OutgoingFromWmsWorker : AsyncPeriodicBackgroundWorkerBase
             await outgoingFromWmsManager.CreateManyAsync(outgoingFromWmsList).ConfigureAwait(false);
             await exchangeDataAppService.UpdateManyAsync(exchangeDataList).ConfigureAwait(false);
         }
-        catch (System.Exception ex)
+        catch (Exception ex)
         {
-
-            throw ex;
+            Logger.LogInformation(ex.Message+ex?.InnerException.Message);
         }
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs

@@ -66,6 +66,13 @@ ISupplierItemAppService supplierItemAppService) : base(repository)
         Dictionary<PurchaseOrder, EntityState> dictionary)
     {
         var ImportData = dictionary.Select(p => p.Key);
+        #region 校验ERP库位是否存在
+        var supplierCount= ImportData.Select(r => r.SupplierCode).Distinct().Count();
+        if (supplierCount > 1)
+        {
+            throw new UserFriendlyException($"不允许导入多个供应商的采购订单！");
+        }
+        #endregion
 
         #region 校验ERP库位是否存在
         var allTempErpLocationCode = ImportData.Select(p => p.Details.Select(p => p.LocationErpCode).ToList()).ToList();