Browse Source

接口添加重传功能和汇总功能

集成Redis
lvzb 2 years ago
parent
commit
0ae706284c
  1. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs
  2. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs
  3. 10
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs
  4. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
  5. 16
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs
  6. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs
  7. 19
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs
  8. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs
  9. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs
  10. 19
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs
  11. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
  12. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs
  13. 27
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
  14. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
  15. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
  16. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs
  17. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs
  18. 5
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs
  19. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs
  20. 5
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs

@ -42,15 +42,17 @@ public class DeliverNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Deliver, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<DeliverNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<DeliverNoteDTO, DeliverNoteExchangeDto>(wmsReceipt);
var purchaseOrder = BuildDataInterface(exchangeReceipt);
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.Deliver.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -75,6 +77,7 @@ public class DeliverNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.Deliver.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Number.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -85,7 +88,7 @@ public class DeliverNoteConverter : IOutgoingConverter
};
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -103,12 +106,12 @@ public class DeliverNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(DeliverNoteExchangeDto exchangeOrder)
private Wmsoutm BuildDataInterface(DeliverNoteExchangeDto exchangeOrder,string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype,
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
@ -136,11 +139,11 @@ public class DeliverNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private static Wmsoutd BuildDataInterfaceDetail(DeliverNoteExchangeDto exchangeOrder, DeliverNoteDetailExchangeDto exchangeDetailOrder)
private static Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, DeliverNoteDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode ?? "",
wmsoutd_qty = exchangeDetailOrder.Qty,

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs

@ -37,15 +37,17 @@ public class IssueNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Issue, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<IssueNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<IssueNoteDTO, IssueNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(exchangeReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.Issue.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber= tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -68,6 +70,7 @@ public class IssueNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.Issue.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -79,7 +82,7 @@ public class IssueNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<IssueNoteDetailDTO, IssueNoteDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -97,11 +100,11 @@ public class IssueNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(IssueNoteExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -116,13 +119,13 @@ public class IssueNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(IssueNoteExchangeDto exchangeOrder, IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail( IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "1",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

10
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs

@ -14,8 +14,8 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing;
public class ItemTransformNoteConverter : IOutgoingConverter
{
public class ItemTransformNoteConverter : IOutgoingConverter
{
private readonly IOutgoingFromWmsManager _outgoingFromWmsManager;
private readonly IOutgoingToExternalManager _outgoingToExternalManager;
private readonly ISupplierAsnAppService _supplierAsnAppService;
@ -46,7 +46,8 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing;
var wmsCountAdjust = JsonSerializer.Deserialize<ItemTransformNoteDTO>(outgoingFromWms.DataContent);
if (Enum.Parse<EnumTransSubType>(wmsCountAdjust.Type) == EnumTransSubType.Item_Transform)
{
var department =await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
string tyrpNumber = outgoingFromWms.TyrpNumber;
var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.ToItemCode, r.LocationErpCode, r.ToLocationCode }).Select(p => new ItemTransformNoteDetailExchangeDto { ToQty = p.Sum(itm => itm.ToQty), FromQty = p.Sum(itm => itm.FromQty), ItemCode = p.Key.ItemCode, ToItemCode = p.Key.ToItemCode, LocationErpCode = p.Key.LocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) });
foreach (var detail in details)
@ -70,6 +71,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing;
{
DataType = outgoingFromWms.DataType,
DataAction = outgoingFromWms.DataAction,
SerialNumber= tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsCountAdjust.Number,
SourceDataGroupCode = wmsCountAdjust.Number,
@ -131,5 +133,5 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing;
exchangeCountAdjust.Detail = wmsCountAdjustDetail;
return exchangeCountAdjust;
}
}
}

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs

@ -38,11 +38,13 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
var wmsReceipt = JsonSerializer.Deserialize<ProductReceiptNoteDTO>(outgoingFromWms.DataContent);
int index=0;//为了处理相同number下存在相同零件号的问题。系统自动在number后添加index,如果只有一条明细就不添加。
foreach (var detail in wmsReceipt.Details)
{
string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number;
// string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number;
string number = index > 0 ? tyrpNumber + index.ToString() : tyrpNumber;
var outgoingToExternal = new OutgoingToExternal()
{
DataType = outgoingFromWms.DataType,

16
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs

@ -52,15 +52,16 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
foreach (var detail in wmsReceipt.Details)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var exchangeReceiptDetail = _objectMapper.Map<ProductRecycleNoteDetailDTO, ProductRecycleNoteDetailExchangeDto>(detail);
var purchaseOrder = BuildDataInterface(exchangeReceipt, exchangeReceiptDetail, departmentCode);
var purchaseOrder = BuildDataInterface(exchangeReceipt, exchangeReceiptDetail, departmentCode, tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.ProductRecycle.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -85,6 +86,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.ProductRecycle.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = materialDetail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -96,7 +98,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeMterialDetail = _objectMapper.Map<ProductRecycleMaterialDetailDTO, ProductRecycleMaterialDetailExchangeDto>(materialDetail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeMterialDetail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeMterialDetail);
var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeMterialDetail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -115,12 +117,12 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleNoteDetailExchangeDto exchangeOrderDetail, string departmentCode)
private Wmsoutm BuildDataInterface(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleNoteDetailExchangeDto exchangeOrderDetail, string departmentCode, string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype,
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
@ -148,11 +150,11 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Wmsoutd BuildDataInterfaceDetail(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleMaterialDetailExchangeDto exchangeDetailOrder)
private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, ProductRecycleMaterialDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode,
wmsoutd_qty = exchangeDetailOrder.Qty,

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs

@ -35,15 +35,17 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.ProductionReturn, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<ProductionReturnNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<ProductionReturnNoteDTO, ProductionReturnNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(exchangeReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.ProductionReturn.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -66,6 +68,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.ProductionReturn.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -77,7 +80,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<ProductionReturnNoteDetailDTO, ProductionReturnNoteDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
var putawayNoteDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -95,11 +98,11 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(ProductionReturnNoteExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -114,13 +117,13 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(ProductionReturnNoteExchangeDto exchangeOrder, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(string tyrpNumber, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "2",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

19
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs

@ -43,15 +43,17 @@ public class PurchaseOrderConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseOrder, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PurchaseOrderDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PurchaseOrderDTO, PurchaseOrderExchangeDto>(wmsReceipt);
var purchaseOrder = BuildDataInterface(exchangeReceipt);
var purchaseOrder = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.PurchaseOrder.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -74,6 +76,7 @@ public class PurchaseOrderConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.PurchaseOrder.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -85,7 +88,7 @@ public class PurchaseOrderConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<PurchaseOrderDetailDTO, PurchaseOrderDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w,tyrpNumber);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -101,13 +104,13 @@ public class PurchaseOrderConverter : IOutgoingConverter
/// <summary>
/// 构建主表
/// </summary>
/// <param name="exchangeOrder"></param>
/// <param name="tyrpNumber">tyepNumber每次生成新number</param>
/// <returns></returns>
private Scontrol BuildDataInterface(PurchaseOrderExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -121,14 +124,16 @@ public class PurchaseOrderConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <param name="dt_w"></param>
/// <param name="tyrpNumber">tyepNumber每次生成新number</param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "3",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"),

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs

@ -41,15 +41,17 @@ public class PurchaseReturnConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReturn, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PurchaseReturnNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PurchaseReturnNoteDTO, PurchaseReturnNoteExchangeDto>(wmsReceipt);
var purchaseReturn = BuildDataInterface(exchangeReceipt);
var purchaseReturn = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.PurchaseReturn.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -73,6 +75,7 @@ public class PurchaseReturnConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.PurchaseReturn.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Number.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -83,7 +86,7 @@ public class PurchaseReturnConverter : IOutgoingConverter
};
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail);
var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w);
var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w, tyrpNumber);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseReturnDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -101,11 +104,11 @@ public class PurchaseReturnConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(PurchaseReturnNoteExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -120,13 +123,13 @@ public class PurchaseReturnConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "4",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs

@ -39,15 +39,17 @@ public class PutawayNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Putaway, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PutawayNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PutawayNoteDTO, PutawayNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(exchangeReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.Putaway.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -72,6 +74,7 @@ public class PutawayNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.Putaway.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -83,7 +86,7 @@ public class PutawayNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<PutawayNoteDetailDTO, PutawayNoteDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber);
try
{
//通过采购订单号查询采购订单要求到货日期
@ -115,11 +118,11 @@ public class PutawayNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -134,13 +137,13 @@ public class PutawayNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"),

19
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs

@ -44,17 +44,19 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.RecycledMaterialReceipt, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<RecycledMaterialReceiptNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<RecycledMaterialReceiptNoteDTO, RecycledMaterialReceiptNoteExchangeDto>(wmsReceipt);
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
var purchaseOrder = BuildDataInterface(exchangeReceipt, departmentCode);
//var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
//var departmentCode = department == null ? "" : department.Code;
var purchaseOrder = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.RecycledMaterialReceipt.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber= tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -77,6 +79,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.RecycledMaterialReceipt.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -88,7 +91,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<RecycledMaterialReceiptNoteDetailDTO, RecycledMaterialReceiptNoteDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail);
var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -106,12 +109,12 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(RecycledMaterialReceiptNoteExchangeDto exchangeOrder, string departmentCode)
private Wmsoutm BuildDataInterface(string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype,
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
@ -139,11 +142,11 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Wmsoutd BuildDataInterfaceDetail(RecycledMaterialReceiptNoteExchangeDto exchangeOrder, RecycledMaterialReceiptNoteDetailExchangeDto exchangeDetailOrder)
private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, RecycledMaterialReceiptNoteDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode,
wmsoutd_qty = exchangeDetailOrder.Qty,

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs

@ -41,6 +41,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Scrap, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
var wmsCountAdjust = JsonSerializer.Deserialize<ScrapNoteDTO>(outgoingFromWms.DataContent);
var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
@ -50,6 +51,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager
{
DataType = outgoingFromWms.DataType,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsCountAdjust.Number,

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs

@ -38,15 +38,17 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.SemiPutaway, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PutawayNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PutawayNoteDTO, PutawayNoteExchangeDto>(wmsReceipt);
var semiPutaway = BuildDataInterface(exchangeReceipt);
var semiPutaway = BuildDataInterface(tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.SemiPutaway.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -69,6 +71,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
DataType = outgoingToExternal.DataType,
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -80,7 +83,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
var exchangeReceiptDetail = _objectMapper.Map<PutawayNoteDetailDTO, PutawayNoteDetailExchangeDto>(detail);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
var SemiPutawayDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, semiPutaway.scontrol_dt_w);
var SemiPutawayDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, semiPutaway.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(SemiPutawayDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -98,11 +101,11 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder)
private Scontrol BuildDataInterface(string tyrpNumber)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -117,13 +120,13 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(string tyrpNumber, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

27
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs

@ -55,12 +55,14 @@ public class TransferNoteConverter : IOutgoingConverter
List<TransferNoteDetailExchangeDto> WipDetails = new List<TransferNoteDetailExchangeDto>();
if (details.Count > 0 && (wmsReceipt.Type != EnumTransSubType.Transfer_Inside.ToString()||wmsReceipt.Type!=EnumTransSubType.Transfer_SplitPacking.ToString()))
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var outgoingToExternal = new OutgoingToExternal()
{
// DataType = dataType,
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -75,7 +77,7 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString();
var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w);
var putawayNoteScontrol = BuildScontrolDataInterface(tyrpNumber, dt_w);
outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteScontrol);
WipDetails =details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode , r.ToLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode, ToLocationErpCode=p.Key.ToLocationErpCode }).ToList();
@ -84,7 +86,7 @@ public class TransferNoteConverter : IOutgoingConverter
else
{
outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString();
var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w);
var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w, tyrpNumber);
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();
@ -102,6 +104,7 @@ public class TransferNoteConverter : IOutgoingConverter
DataType = outgoingToExternal.DataType,
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Number.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -116,12 +119,12 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w);
var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(tyrpNumber, detail, dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend);
}
else
{
var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(exchangeReceipt, detail);
var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(tyrpNumber, detail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailWmsoutd);
}
outgoingToExternalList.Add(outgoingDetailToExternal);
@ -143,11 +146,11 @@ public class TransferNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w)
private Scontrol BuildScontrolDataInterface(string tyrpNumber, string dt_w)
{
var ret = new Scontrol()
{
scontrol_nbr = exchangeOrder.Number,
scontrol_nbr = tyrpNumber,
scontrol_dt_w = dt_w,
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -162,13 +165,13 @@ public class TransferNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildScmsendDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype_s,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_nbr = tyrpNumber,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",
@ -188,11 +191,11 @@ public class TransferNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w)
private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w,string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype_w,
wmsoutm_dt_w = dt_w,
wmsoutm_stat = "Y",
@ -219,11 +222,11 @@ public class TransferNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Wmsoutd BuildWmsoutdDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder)
private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode,
wmsoutd_qty = exchangeDetailOrder.Qty,

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs

@ -48,6 +48,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedIssue, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedIssueNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt);
@ -62,12 +63,13 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
}
}
var purchaseOrder = BuildDataInterface(exchangeReceipt);
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedIssue.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -91,6 +93,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.UnplannedIssue.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Number.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -102,7 +105,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -120,11 +123,11 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder)
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype,
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
@ -152,11 +155,11 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Wmsoutd BuildDataInterfaceDetail(UnplannedIssueNoteExchangeDto exchangeOrder, UnplannedIssueNoteDetailExchangeDto exchangeDetailOrder)
private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedIssueNoteDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
wmsoutd_qty = exchangeDetailOrder.Qty,

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs

@ -49,6 +49,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedReceipt, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedReceiptNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(wmsReceipt);
@ -62,12 +63,13 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
exchangeReceipt.Worker = username;
}
}
var purchaseOrder = BuildDataInterface(exchangeReceipt);
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),
TableType = EnumExchangeTableType.MainTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber=tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsReceipt.Id.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -92,6 +94,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),
TableType = EnumExchangeTableType.DetailTable,
DataAction = outgoingFromWms.DataAction,
SerialNumber = tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = detail.Number.ToString(),
SourceDataGroupCode = wmsReceipt.Number,
@ -102,7 +105,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
};
outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail);
var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -120,12 +123,12 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder)
private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber)
{
var ret = new Wmsoutm()
{
wmsoutm_nbr = exchangeOrder.Number,
wmsoutm_nbr = tyrpNumber,
wmsoutm_type = billtype,
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
@ -153,11 +156,11 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Wmsoutd BuildDataInterfaceDetail(UnplannedReceiptNoteExchangeDto exchangeOrder, UnplannedReceiptNoteDetailExchangeDto exchangeDetailOrder)
private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedReceiptNoteDetailExchangeDto exchangeDetailOrder)
{
var ret = new Wmsoutd()
{
wmsoutd_nbr = exchangeOrder.Number,
wmsoutd_nbr = tyrpNumber,
wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
wmsoutd_qty = exchangeDetailOrder.Qty,

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs

@ -43,6 +43,7 @@ public class WIPAdjusNoteConverter : IOutgoingConverter
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.WIPAdjust, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
string tyrpNumber = outgoingFromWms.TyrpNumber;
var wmsCountAdjust = JsonSerializer.Deserialize<CountAdjustNoteDTO>(outgoingFromWms.DataContent);
var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
@ -57,6 +58,7 @@ public class WIPAdjusNoteConverter : IOutgoingConverter
{
DataType = outgoingFromWms.DataType,
DataAction = outgoingFromWms.DataAction,
SerialNumber= tyrpNumber,
SourceSystem = EnumSystemType.WMS.ToString(),
SourceDataId = wmsCountAdjust.Number,
SourceDataGroupCode = wmsCountAdjust.Number,

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs

@ -4,4 +4,8 @@ public class ArchivedOutgoingFromWms : WmsDataBase
{
public long Number { get; protected internal set; }
/// <summary>
/// Tyrp系统编号
/// </summary>
public string TyrpNumber { get; set; }
}

5
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs

@ -3,5 +3,8 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain;
public class ArchivedOutgoingToExternal : ExternalDataBase
{
public long Number { get; protected internal set; }
/// <summary>
/// 流水号
/// </summary>
public string SerialNumber { get; set; }
}

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs

@ -10,6 +10,10 @@ public class OutgoingFromWms : WmsDataBase
/// </summary>
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Number { get; protected internal set; }
/// <summary>
/// Tyrp系统编号
/// </summary>
public string TyrpNumber { get; set; }
public string DestinationSystem { get; set; }

5
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs

@ -10,7 +10,10 @@ public class OutgoingToExternal : ExternalDataBase
/// </summary>
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Number { get; protected internal set; }
/// <summary>
/// 流水号
/// </summary>
public string SerialNumber { get;set; }
public override void Reset(string remark = null)
{
base.Reset(remark);

Loading…
Cancel
Save