From ae818b16761baf2f75969b91df8eabb0238dacdb Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 15 Sep 2023 17:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=93=8E=EF=BC=8Ctr?= =?UTF-8?q?yp=E6=8E=A5=E5=8F=A3=E8=AE=BE=E7=BD=AE=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4wms=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=88=E6=9C=AA=E5=90=AF=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.json | 2 +- .../Outgoing/TyrpOutgoingBackgroundWorker.cs | 3 ++- .../OutgoingFromWmsWorker.cs | 11 +++++++++++ .../DataExchanges/IssueNoteEventHandler.cs | 5 +++-- .../DataExchanges/PurchaseReceiptNoteEventHandler.cs | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json index 0e6ea7a9c..59ec16e21 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", - "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=WMS_DongYang_DataExchange;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", + "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", "EOS": "Server=61.139.155.47;Database=EOSSH;Uid=wms;Pwd=1;TrustServerCertificate=True" }, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs index 943cbc986..3ca74c2f7 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs @@ -1,3 +1,4 @@ +using System.Data; using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; @@ -28,7 +29,7 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase } - [UnitOfWork] + [UnitOfWork(true,isolationLevel:IsolationLevel.Serializable,50)] protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"Starting: Handling {Outgoing}"); diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs index 4f87eb68c..561d04d32 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs @@ -33,6 +33,17 @@ public class OutgoingFromWmsWorker : AsyncPeriodicBackgroundWorkerBase //Do the work var batchSize = _options.BatchSize; + //List filters = new List(); + //filters.Add( new Filter("Status", EnumExchangeDataStatus.Unread.ToString())); + //var input = new SfsStoreRequestInputBase + //{ + // Condition = new Condition { Filters = filters }, + // MaxResultCount = batchSize, + // SkipCount = 0, + // Sorting = "WriteTime" + //}; + + //var exchangeDataList = await exchangeDataAppService.GetAllListByFilterAsync(input).ConfigureAwait(false); var exchangeDataList = await exchangeDataAppService.GetToBeProcessedListAsync(batchSize).ConfigureAwait(false); var outgoingFromWmsList = objectMapper.Map, List>(exchangeDataList); await outgoingFromWmsManager.CreateManyAsync(outgoingFromWmsList).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/IssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/IssueNoteEventHandler.cs index a081b44fe..fade97b9d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/IssueNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/IssueNoteEventHandler.cs @@ -38,8 +38,9 @@ public class IssueNoteEventHandler { await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false); } - var exchangeDatames = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.MES, ExchangeDataType, dtos).ConfigureAwait(false); - await AddManyAsync(exchangeDatames).ConfigureAwait(false); + //20230915mes无此接口 + //var exchangeDatames = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.MES, ExchangeDataType, dtos).ConfigureAwait(false); + // await AddManyAsync(exchangeDatames).ConfigureAwait(false); //如果无明细不给tyrp传接口只给mes传接口 var toErpDto = new List(); foreach (var item in dtos) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/PurchaseReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/PurchaseReceiptNoteEventHandler.cs index 332591e09..151736341 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/PurchaseReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/PurchaseReceiptNoteEventHandler.cs @@ -37,7 +37,7 @@ public class PurchaseReceiptNoteEventHandler { await detail.TrySetLocationAsync(LocationAclService, detail.LocationCode).ConfigureAwait(false); } - //QAD + //20230915tyrp无此接口 var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false); await AddManyAsync(exchangeData).ConfigureAwait(false); }