From 03464aef6e7124f811996d17660bb273f152ce4d Mon Sep 17 00:00:00 2001 From: "mingliang.tang" Date: Thu, 20 Jul 2023 14:07:40 +0800 Subject: [PATCH] =?UTF-8?q?MES=EF=BC=8Ctyrp=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/BackFluConverter.cs | 19 ++++++++++++------- .../Incoming/MesOutReader.cs | 4 ++-- .../Outgoing/DeliverNoteConverter.cs | 2 +- .../WMS/DeliverNote/DeliverNoteExchangeDto.cs | 2 +- ...Wms.DataExchange.Application.Contracts.xml | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs index 2e91e45f9..0f65ef1bd 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs @@ -58,7 +58,7 @@ public class BackFluConverter : IIncomingConverter { await Task.CompletedTask.ConfigureAwait(false); var incomingToWmsList = new List(); - var groups = incomingDataList.GroupBy(p => p.SourceDataGroupCode); + var groups = incomingDataList.GroupBy(p => new { p.SourceDataGroupCode,p.SourceDataDetailCode }); foreach (var group in groups) { var first = group.First(); @@ -97,13 +97,17 @@ public class BackFluConverter : IIncomingConverter wmsBack.WarehouseCode = "jiekou"; wmsBack.Lot = "jiekou"; wmsBack.Details = new List(); - foreach (var incomingFromExternal in group.ToList()) + decimal Qty = 0; + foreach (var incomingFromExternal in group.ToList())//根据单据号和零件号汇总数量 { - var back = JsonSerializer.Deserialize(incomingFromExternal.DestinationDataContent); + var backflu = JsonSerializer.Deserialize(incomingFromExternal.DestinationDataContent); + var backfluDetail = _objectMapper.Map(backflu.Detail); + Qty = backfluDetail.Qty + Qty; + } + var back = JsonSerializer.Deserialize(first.DestinationDataContent); var wmsBackDetail = _objectMapper.Map(back.Detail); wmsBackDetail.Lot = ""; - var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false); - + var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false); if (item != null) { wmsBackDetail.ItemName = item.Name; @@ -114,6 +118,7 @@ public class BackFluConverter : IIncomingConverter wmsBackDetail.ItemName = ""; wmsBackDetail.Uom = ""; } + wmsBackDetail.Qty = Qty; var typesAndErpCodeAsync = await _locationAppService.GetListByTypesAndErpCodeAsync(new EditableList() { EnumLocationType.WIP }, wmsBackDetail.LocationErpCode).ConfigureAwait(false); var loctioncode = typesAndErpCodeAsync.First(); wmsBackDetail.LocationCode = loctioncode.Code; @@ -122,10 +127,10 @@ public class BackFluConverter : IIncomingConverter wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode; wmsBackDetail.PackingCode = "jiekou"; wmsBack.Details.Add(wmsBackDetail); - } + //} incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack); incomingToWmsList.Add(incomingToWms); - } + } return incomingToWmsList; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs index 2ee47259e..63b9d0c06 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs @@ -135,8 +135,8 @@ public class MesOutReader : IReader ItemCode = mesOut.Mesout_part, Qty = mesOut.Mesout_move, LocationErpCode = mesOut.Mesout_loc, - Remark = mesOut.memo - + Remark = mesOut.memo, + ReturnQty=mesOut.Mesout_bad }; productReceiptNote.Detail = productReceiptNoteDetail; return productReceiptNote; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs index e87bc9ef2..1838a1f4e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs @@ -114,7 +114,7 @@ public class DeliverNoteConverter : IOutgoingConverter wmsoutm_user = "WMS", wmsoutm_dept = "", wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), - wmsoutm_cust = exchangeOrder.Customer ?? "", + wmsoutm_cust = exchangeOrder.CustomerCode ?? "", wmsoutm_shm_nbr = "", wmsoutm_cust_loc = "", wmsoutm_stock_stat = "", diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteExchangeDto.cs index 49494e775..f869e4fc8 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteExchangeDto.cs @@ -25,5 +25,5 @@ public class DeliverNoteExchangeDto /// [Display(Name = "客户")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string Customer { get; set; } + public string CustomerCode { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index a3222aafa..4fb63236c 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -546,7 +546,7 @@ 生效日期 - + 客户