From db2574cc6c9376dfe4b319c070957ca60f586546 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 25 Jun 2024 13:37:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/ShipConverter.cs | 2 +- .../SplitPackings/Inputs/SplitPackingRecEditInput.cs | 6 ++++++ .../InventoryLabels/InventoryLabelAppService.cs | 1 + .../Notes/PutawayNotes/PutawayNoteAppService.cs | 1 + .../Notes/TransferNotes/TransferNoteAppService.cs | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs index 28f70da1d..caad0a376 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs @@ -118,7 +118,7 @@ public class ShipConverter : IIncomingConverter purchaseLabel.LabelType = EnumLabelType.PurchaseLabel; var supplierDto = await _supplierAppService.GetByCodeAsync(exchangeAsn.SupplierCode).ConfigureAwait(false); purchaseLabel.SupplierCode = exchangeAsn.SupplierCode; - purchaseLabel.PoNumber = exchangeAsn.Number; + purchaseLabel.PoNumber = exchangeAsn.PoNumber; purchaseLabel.Qty = exchangeAsn.Detail.Qty; diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs index 1a450a8fc..8da64f8b0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs @@ -134,6 +134,12 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string PurchaseInfo_AsnNumber { get; set; } + /// + /// 供应商代码 + /// + [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string PurchaseInfo_SupplierCode { get; set; } + /// /// 到货通知 /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs index d37e03c89..bcf582b7b 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs @@ -189,6 +189,7 @@ public class InventoryLabelAppService packRec.ToLot = inputObj.Lot; packRec.PurchaseInfo_PoNumber = inputObj.PoNumber; // 采购订单 packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber; //供应商发货单 + packRec.PurchaseInfo_SupplierCode = inputObj.SupplierCode; //供应商发货单 packRec.ArrivalNoticNumber = null; //到货通知 packRec.TaskOrderNumber = null; //任务单 packRec.ReceiptRecNumber = null; //收货记录单 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs index d29cb989b..e989e3707 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs @@ -87,6 +87,7 @@ public class PutawayNoteAppService : tempEditInput.ProductReceiptNumber = string.Empty; tempEditInput.PurchaseReceiptRequestNumber = string.Empty; tempEditInput.Type = EnumPutawayType.PurchasePutaway; + tempEditInput.Number = groupWhere.Key.PoNumber; foreach (var packingCode in groupWhere) { var detailInput=input.Details.First(p => p.ToPackingCode == packingCode.ToPackingCode); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 3fb7b5b0e..26026ada5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -474,6 +474,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase { packRec.PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber; packRec.PurchaseInfo_AsnNumber = inventoryLabelDto.AsnNumber; + packRec.PurchaseInfo_SupplierCode = inventoryLabelDto.SupplierCode; #region InventoryLabel兼容成员 var inputObj = inventoryLabelDto; From 50c23c6efa29aeb100c61b115b716f6ec40f14f3 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 25 Jun 2024 14:36:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs | 4 ++-- .../src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 59cf323ef..2c4e49401 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -149,7 +149,7 @@ public class AgentModule : AbpModule public override void OnApplicationInitialization( ApplicationInitializationContext context) { - context.AddBackgroundWorkerAsync(); - // context.AddBackgroundWorkerAsync(); + //context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json index 7b848b1b8..0f8bdf492 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json @@ -29,7 +29,7 @@ "BaseUrl": "http://dev.ccwin-in.com:60084/" }, "Store": { - "BaseUrl": "http://localhost:59095/" + "BaseUrl": "http://dev.ccwin-in.com:60085/" }, "Label": { "BaseUrl": "http://dev.ccwin-in.com:60082/"