diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
index 05a75e3d7..01f33279a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
@@ -22,19 +22,22 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
private readonly IDepartmentAppService _departmentAppService;
private readonly IObjectMapper _objectMapper;
private readonly ISfsUserAppService _sfsUserAppService;
+ private readonly IUnplannedIssueRequestAppService _unplannedIssueRequestAppService;
public UnplannedIssueNoteConverter(
IOutgoingFromWmsManager outgoingFromWmsManager
, IOutgoingToExternalManager outgoingToExternalManager
, IDepartmentAppService departmentAppService
, IObjectMapper objectMapper
- , ISfsUserAppService sfsUserAppService)
+ , ISfsUserAppService sfsUserAppService,
+IUnplannedIssueRequestAppService unplannedIssueRequestAppService)
{
_outgoingFromWmsManager = outgoingFromWmsManager;
_outgoingToExternalManager = outgoingToExternalManager;
_departmentAppService = departmentAppService;
_objectMapper = objectMapper;
_sfsUserAppService = sfsUserAppService;
+ _unplannedIssueRequestAppService = unplannedIssueRequestAppService;
}
///
@@ -54,6 +57,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
var exchangeReceipt = _objectMapper.Map(wmsReceipt);
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
+ var requset=await _unplannedIssueRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedIssueRequestNumber).ConfigureAwait(false);
//if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
//{
// var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
@@ -63,7 +67,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
// }
//}
- var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
+ var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, requset?.Worker);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedIssue.ToString(),
@@ -123,7 +127,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
///
///
///
- private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode)
+ private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode,string worker)
{
string billtype = "4013";
if (exchangeOrder.UnplannedIssueType== EnumUnplannedIssueType.Wip)
@@ -137,7 +141,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "",
- wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length- 6) : exchangeOrder.Worker,
+ wmsoutm_user = worker.Length >= 6 ? worker.Substring(worker.Length- 6) : worker,
wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取
// wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
index 1a5cb0d4d..6908c580b 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
@@ -23,20 +23,22 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
private readonly IDepartmentAppService _departmentAppService;
private readonly IObjectMapper _objectMapper;
private readonly ISfsUserAppService _sfsUserAppService;
-
+ private readonly IUnplannedReceiptRequestAppService _unplannedReceiptRequestAppService;
public UnplannedReceiptNoteConverter(
IOutgoingFromWmsManager outgoingFromWmsManager
, IOutgoingToExternalManager outgoingToExternalManager
, IDepartmentAppService departmentAppService
, IObjectMapper objectMapper
, ISfsUserAppService sfsUserAppService
- )
+,
+IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService )
{
_outgoingFromWmsManager = outgoingFromWmsManager;
_outgoingToExternalManager = outgoingToExternalManager;
_departmentAppService = departmentAppService;
_objectMapper = objectMapper;
_sfsUserAppService = sfsUserAppService;
+ _unplannedReceiptRequestAppService = unplannedReceiptRequestAppService;
}
///
@@ -56,6 +58,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
var exchangeReceipt = _objectMapper.Map(wmsReceipt);
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
+ var requset = await _unplannedReceiptRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedReceiptRequestNumber).ConfigureAwait(false);
//if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
//{
// var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
@@ -64,7 +67,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
// exchangeReceipt.Worker = username;
// }
//}
- var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
+ var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, requset?.Worker);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),
@@ -124,7 +127,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
///
///
///
- private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode)
+ private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode,string worker)
{
string billtype = "4014";
if (exchangeOrder.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
@@ -138,7 +141,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "",
- wmsoutm_user = exchangeOrder.Worker.Length>=6? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length-6) : exchangeOrder.Worker,
+ wmsoutm_user = worker.Length>=6? worker.Substring(worker.Length-6) : worker,
wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取
//wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs
index b27945058..ec0720fe2 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs
@@ -27,4 +27,9 @@ public class UnplannedIssueNoteExchangeDto
/// 领料类别
///
public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+ ///
+ /// 计划外出库请求单号
+ ///
+ public string UnplannedIssueRequestNumber { get; set; }
}
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs
index abae086af..8658a9d6c 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs
@@ -1,4 +1,8 @@
using System;
+using IdentityServer4.Models;
+using System.ComponentModel.DataAnnotations;
+using System.Xml.Linq;
+using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote;
@@ -29,4 +33,9 @@ public class UnplannedReceiptNoteExchangeDto
///
public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+ ///
+ /// 计划外入库请求单号
+ ///
+ public string UnplannedReceiptRequestNumber { 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 880561d6c..327228cd2 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
@@ -1711,6 +1711,11 @@
领料类别
+
+
+ 计划外出库请求单号
+
+
单据号
@@ -1771,6 +1776,11 @@
退料类别
+
+
+ 计划外入库请求单号
+
+
用户号码