From a503031eafb683e8a1dd9f95df89b4b0d3be2343 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Wed, 26 Apr 2023 20:10:57 +0800
Subject: [PATCH] =?UTF-8?q?EOS=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Outgoing/ArriveConverter.cs | 13 ++++++++++++-
...Sfs.Wms.DataExchange.Application.Contracts.xml | 15 +++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
index f66228193..207931f9a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
@@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Label.Application.Contracts;
using Win_in.Sfs.Wms.DataExchange.Domain;
using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.EOS;
using Win_in.Sfs.Wms.DataExchange.Domain.Shared;
@@ -17,6 +19,7 @@ public class ArriveConverter : IOutgoingConverter
private readonly IOutgoingToExternalManager _outgoingToExternalManager;
private readonly ISupplierAsnAppService _supplierAsnAppService;
private readonly IObjectMapper _objectMapper;
+ private readonly IInventoryLabelAppService _inventoryLabelAppService;
public ArriveConverter(
@@ -24,8 +27,10 @@ public class ArriveConverter : IOutgoingConverter
, IOutgoingToExternalManager outgoingToExternalManager
, ISupplierAsnAppService supplierAsnAppService
, IObjectMapper objectMapper
+ , IInventoryLabelAppService inventoryLabelAppService
)
{
+ _inventoryLabelAppService = inventoryLabelAppService;
_outgoingFromWmsManager = outgoingFromWmsManager;
_outgoingToExternalManager = outgoingToExternalManager;
_supplierAsnAppService = supplierAsnAppService;
@@ -60,6 +65,12 @@ public class ArriveConverter : IOutgoingConverter
var exchangeReceipt = await BuildPutawayExchangeDtoAsync(wmsReceipt, detail).ConfigureAwait(false);
outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceipt);
var arrive = BuildArrive(exchangeReceipt);
+
+ var label = await _inventoryLabelAppService.GetByCodeAsync(arrive.DetailMatNo).ConfigureAwait(false);
+ if (label != null)
+ {
+ arrive.ShipBillNo = label.AsnNumber;
+ }
outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive);
outgoingToExternalList.Add(outgoingToExternal);
@@ -87,7 +98,7 @@ public class ArriveConverter : IOutgoingConverter
DocNo = exchangeReceipt.Number,
DetailMatNo = detail.ToPackingCode,
ERP = detail.ItemCode,
- Qty = detail.ShippedQty,
+ Qty = detail.Qty,
HgQty = detail.Qty,
ProductDate = detail.ProduceDate,
ProductBatch = detail.ToLot,
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 c1283a9e2..89fa4a1e8 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
@@ -876,6 +876,11 @@
物品代码
+
+
+ 库位组
+
+
排序批次
@@ -1601,6 +1606,11 @@
来源ERP库位
+
+
+ 库位组
+
+
数量
@@ -1636,6 +1646,11 @@
来源ERP库位
+
+
+ 库位组
+
+
数量