diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs index 6ce604ddd..22d556b49 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs @@ -93,8 +93,6 @@ public class TransferNoteConverter : IOutgoingConverter else { outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString(); - - var toLocationErpcode = details[0].ToLocationErpCode; var erplocation = await _erpLocationAppService.GetByCodeAsync(toLocationErpcode).ConfigureAwait(false); if (erplocation?.Type != "2") @@ -102,14 +100,9 @@ public class TransferNoteConverter : IOutgoingConverter stat = "2"; } var location = stat == "1" ? details[0].ToLocationErpCode : details[0].FromLocationErpCode; - - var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w, tyrpNumber, wmsReceipt.Number, location); - outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm); - WipDetails = details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode }).ToList(); - } outgoingToExternalList.Add(outgoingToExternal); 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 05d79969d..8cc6c32e1 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 @@ -46,77 +46,77 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase int wmsoutm_count = 0; //wmsoutm插入条数 int mesout_asd_count = 0; //mesout_asd插入条数 - #region 采购单 PurchaseOrder scontrol - Logger.LogInformation($"Write PurchaseOrder");//采购单 - var purchaseOrderConvert = workerContext.ServiceProvider.GetRequiredService(); - var purchaseOrderList = await purchaseOrderConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(purchaseOrderList).ConfigureAwait(false); - if (purchaseOrderList.Count > 0) - { - Logger.LogInformation($"采购单-PurchaseOrder处理{purchaseOrderList.Count}条"); - scontrol_count += purchaseOrderList.Count; - } - #endregion + //#region 采购单 PurchaseOrder scontrol + //Logger.LogInformation($"Write PurchaseOrder");//采购单 + //var purchaseOrderConvert = workerContext.ServiceProvider.GetRequiredService(); + //var purchaseOrderList = await purchaseOrderConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(purchaseOrderList).ConfigureAwait(false); + //if (purchaseOrderList.Count > 0) + //{ + // Logger.LogInformation($"采购单-PurchaseOrder处理{purchaseOrderList.Count}条"); + // scontrol_count += purchaseOrderList.Count; + //} + //#endregion - #region 采购退货单 PurchaseReturn scontrol - Logger.LogInformation($"Write PurchaseReturn");//采购退货单(汇总) - var purchaseReturnConvert = workerContext.ServiceProvider.GetRequiredService(); - var purchaseReturnList = await purchaseReturnConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(purchaseReturnList).ConfigureAwait(false); - if (purchaseReturnList.Count > 0) - { - Logger.LogInformation($"采购退货单-PurchaseReturn处理{purchaseReturnList.Count}条"); - scontrol_count += purchaseReturnList.Count; - } - #endregion + //#region 采购退货单 PurchaseReturn scontrol + //Logger.LogInformation($"Write PurchaseReturn");//采购退货单(汇总) + //var purchaseReturnConvert = workerContext.ServiceProvider.GetRequiredService(); + //var purchaseReturnList = await purchaseReturnConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(purchaseReturnList).ConfigureAwait(false); + //if (purchaseReturnList.Count > 0) + //{ + // Logger.LogInformation($"采购退货单-PurchaseReturn处理{purchaseReturnList.Count}条"); + // scontrol_count += purchaseReturnList.Count; + //} + //#endregion - #region 验收单 Putaway scontrol - Logger.LogInformation($"Write PutawayNote");//验收单(汇总) - var putawayNoteConvert = workerContext.ServiceProvider.GetRequiredService(); - var putawayNoteList = await putawayNoteConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(putawayNoteList).ConfigureAwait(false); - if (putawayNoteList.Count > 0) - { - Logger.LogInformation($"验收单-Putaway处理{putawayNoteList.Count}条"); - scontrol_count += putawayNoteList.Count; - } - #endregion + //#region 验收单 Putaway scontrol + //Logger.LogInformation($"Write PutawayNote");//验收单(汇总) + //var putawayNoteConvert = workerContext.ServiceProvider.GetRequiredService(); + //var putawayNoteList = await putawayNoteConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(putawayNoteList).ConfigureAwait(false); + //if (putawayNoteList.Count > 0) + //{ + // Logger.LogInformation($"验收单-Putaway处理{putawayNoteList.Count}条"); + // scontrol_count += putawayNoteList.Count; + //} + //#endregion - #region 线边仓领料单 Issue scontrol - Logger.LogInformation($"Write IssueNote");//线边仓领料单(汇总) - var issueNoteConvert = workerContext.ServiceProvider.GetRequiredService(); - var issueNoteList = await issueNoteConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(issueNoteList).ConfigureAwait(false); - if (issueNoteList.Count > 0) - { - Logger.LogInformation($"线边仓领料单-Issue处理{issueNoteList.Count}条"); - scontrol_count += issueNoteList.Count; - } - #endregion + //#region 线边仓领料单 Issue scontrol + //Logger.LogInformation($"Write IssueNote");//线边仓领料单(汇总) + //var issueNoteConvert = workerContext.ServiceProvider.GetRequiredService(); + //var issueNoteList = await issueNoteConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(issueNoteList).ConfigureAwait(false); + //if (issueNoteList.Count > 0) + //{ + // Logger.LogInformation($"线边仓领料单-Issue处理{issueNoteList.Count}条"); + // scontrol_count += issueNoteList.Count; + //} + //#endregion - #region 线边仓退料单 ProductionReturn scontrol - Logger.LogInformation($"Write ProductionReturnNote");//线边仓退料单(汇总) - var productionReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService(); - var productionReturnNoteList = await productionReturnNoteConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(productionReturnNoteList).ConfigureAwait(false); - if (productionReturnNoteList.Count > 0) - { - Logger.LogInformation($"线边仓退料单-ProductionReturn处理{productionReturnNoteList.Count}条"); - scontrol_count += productionReturnNoteList.Count; - } - #endregion + //#region 线边仓退料单 ProductionReturn scontrol + //Logger.LogInformation($"Write ProductionReturnNote");//线边仓退料单(汇总) + //var productionReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService(); + //var productionReturnNoteList = await productionReturnNoteConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(productionReturnNoteList).ConfigureAwait(false); + //if (productionReturnNoteList.Count > 0) + //{ + // Logger.LogInformation($"线边仓退料单-ProductionReturn处理{productionReturnNoteList.Count}条"); + // scontrol_count += productionReturnNoteList.Count; + //} + //#endregion - #region 半成品上架 SemiPutaway scontrol - Logger.LogInformation($"Write SemiPutawayNote");//半成品上架 - var semiPutawayNoteConvert = workerContext.ServiceProvider.GetRequiredService(); - var semiPutawayNoteList = await semiPutawayNoteConvert.ConvertAsync().ConfigureAwait(false); - await scontrolWriter.WriteAsync(semiPutawayNoteList).ConfigureAwait(false); - if (semiPutawayNoteList.Count > 0) - { - Logger.LogInformation($"半成品上架-SemiPutaway处理{semiPutawayNoteList.Count}条"); - scontrol_count += semiPutawayNoteList.Count; - } - #endregion + //#region 半成品上架 SemiPutaway scontrol + //Logger.LogInformation($"Write SemiPutawayNote");//半成品上架 + //var semiPutawayNoteConvert = workerContext.ServiceProvider.GetRequiredService(); + //var semiPutawayNoteList = await semiPutawayNoteConvert.ConvertAsync().ConfigureAwait(false); + //await scontrolWriter.WriteAsync(semiPutawayNoteList).ConfigureAwait(false); + //if (semiPutawayNoteList.Count > 0) + //{ + // Logger.LogInformation($"半成品上架-SemiPutaway处理{semiPutawayNoteList.Count}条"); + // scontrol_count += semiPutawayNoteList.Count; + //} + //#endregion #region 储位、线边仓调拨单 和 客户储位调拨单 Transfer scontrol Logger.LogInformation($"Write TransferNote");//储位、线边仓调拨单 和 客户储位调拨单(汇总) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json index bc4ac8442..5fc6279cf 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json @@ -1,13 +1,13 @@ { "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_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", - "TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", - "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1 + "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false", + "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false", + "TYRP": "Server=dev.ccwin-in.com,13319;Database=TYRP_CC;Uid=ccwin-in;Pwd=Microsoft@2022;TrustServerCertificate=True", + "SYBASE_TYRP": "Data Source=10.164.233.4; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1 }, "AuthServer": { - "Authority": "http://10.164.113.31:60083/", + "Authority": "http://dev.ccwin-in.com:60083/", "RequireHttpsMetadata": "false", "SwaggerClientId": "admin", "SwaggerClientSecret": "1q2w3E*", @@ -26,16 +26,16 @@ "RemoteServices": { "BaseData": { - "BaseUrl": "http://10.164.113.31:60084/" + "BaseUrl": "http://dev.ccwin-in.com:60084/" }, "Store": { - "BaseUrl": "http://10.164.113.31:60085/" + "BaseUrl": "http://dev.ccwin-in.com:60085/" }, "Label": { - "BaseUrl": "http://10.164.113.31:60082/" + "BaseUrl": "http://dev.ccwin-in.com:60082/" }, "Auth": { - "BaseUrl": "http://10.164.113.31:60083/" + "BaseUrl": "http://dev.ccwin-in.com:60083/" } }, "TyrpOptions": {