Browse Source

TYRP跟scontrol表有接口业务得都改位传单据号不传流水号

集成Redis
lvzb 2 years ago
parent
commit
65e855319b
  1. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs
  2. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs
  3. 16
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs
  4. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs
  5. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs
  6. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs
  7. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs

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

@ -41,7 +41,7 @@ public class IssueNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<IssueNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<IssueNoteDTO, IssueNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var putawayNote = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.Issue.ToString(),
@ -82,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(exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -100,11 +100,11 @@ public class IssueNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(IssueNoteExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -119,13 +119,13 @@ public class IssueNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail( IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber)
private Scmsend BuildDataInterfaceDetail(IssueNoteExchangeDto exchangeOrder, IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "1",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

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

@ -39,7 +39,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<ProductionReturnNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<ProductionReturnNoteDTO, ProductionReturnNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var putawayNote = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.ProductionReturn.ToString(),
@ -80,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(tyrpNumber, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -98,11 +98,11 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(ProductionReturnNoteExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -117,13 +117,13 @@ public class ProductionReturnNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(string tyrpNumber, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(ProductionReturnNoteExchangeDto exchangeOrder, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "2",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

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

@ -47,7 +47,7 @@ public class PurchaseOrderConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PurchaseOrderDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PurchaseOrderDTO, PurchaseOrderExchangeDto>(wmsReceipt);
var purchaseOrder = BuildDataInterface(tyrpNumber);
var purchaseOrder = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.PurchaseOrder.ToString(),
@ -88,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,tyrpNumber);
var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -104,13 +104,13 @@ public class PurchaseOrderConverter : IOutgoingConverter
/// <summary>
/// 构建主表
/// </summary>
/// <param name="tyrpNumber">tyepNumber每次生成新number</param>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(PurchaseOrderExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -124,16 +124,14 @@ 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,string tyrpNumber)
private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "3",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"),

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

@ -45,7 +45,7 @@ public class PurchaseReturnConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PurchaseReturnNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PurchaseReturnNoteDTO, PurchaseReturnNoteExchangeDto>(wmsReceipt);
var purchaseReturn = BuildDataInterface(tyrpNumber);
var purchaseReturn = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.PurchaseReturn.ToString(),
@ -86,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, tyrpNumber);
var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseReturnDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -104,11 +104,11 @@ public class PurchaseReturnConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(PurchaseReturnNoteExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -123,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,string tyrpNumber)
private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "4",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

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

@ -43,7 +43,7 @@ public class PutawayNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PutawayNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PutawayNoteDTO, PutawayNoteExchangeDto>(wmsReceipt);
var putawayNote = BuildDataInterface(tyrpNumber);
var putawayNote = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.Putaway.ToString(),
@ -86,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, tyrpNumber);
var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
try
{
//通过采购订单号查询采购订单要求到货日期
@ -118,11 +118,11 @@ public class PutawayNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -137,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,string tyrpNumber)
private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"),

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

@ -42,7 +42,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<PutawayNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<PutawayNoteDTO, PutawayNoteExchangeDto>(wmsReceipt);
var semiPutaway = BuildDataInterface(tyrpNumber);
var semiPutaway = BuildDataInterface(exchangeReceipt);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.SemiPutaway.ToString(),
@ -83,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(tyrpNumber, exchangeReceiptDetail, semiPutaway.scontrol_dt_w);
var SemiPutawayDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, semiPutaway.scontrol_dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(SemiPutawayDetail);
outgoingToExternalList.Add(outgoingDetailToExternal);
}
@ -101,11 +101,11 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildDataInterface(string tyrpNumber)
private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -120,13 +120,13 @@ public class SemiPutawayNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildDataInterfaceDetail(string tyrpNumber, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

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

@ -77,7 +77,7 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString();
var putawayNoteScontrol = BuildScontrolDataInterface(tyrpNumber, dt_w);
var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, 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();
@ -119,7 +119,7 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(tyrpNumber, detail, dt_w);
var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend);
}
else
@ -146,11 +146,11 @@ public class TransferNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Scontrol BuildScontrolDataInterface(string tyrpNumber, string dt_w)
private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w)
{
var ret = new Scontrol()
{
scontrol_nbr = tyrpNumber,
scontrol_nbr = exchangeOrder.Number,
scontrol_dt_w = dt_w,
scontrol_stat = "Y",
scontrol_dt_k = "",
@ -165,13 +165,13 @@ public class TransferNoteConverter : IOutgoingConverter
/// <param name="exchangeOrder"></param>
/// <param name="exchangeDetailOrder"></param>
/// <returns></returns>
private Scmsend BuildScmsendDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
{
var ret = new Scmsend()
{
scmsend_type = billtype_s,
scmsend_dt_w = dt_w,
scmsend_nbr = tyrpNumber,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "0",
scmsend_part = exchangeDetailOrder.ItemCode,
scmsend_delv_date = "",

Loading…
Cancel
Save