Browse Source

非生产领料退料添加获取部门方法

集成Redis
lvzb 2 years ago
parent
commit
766b902895
  1. 26
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
  2. 26
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs

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

@ -52,18 +52,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedIssueNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt);
//var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
//var departmentCode = department == null ? "" : department.Code;
if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
{
var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
if (!string.IsNullOrEmpty(username))
{
exchangeReceipt.Worker = username;
}
}
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
//if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
//{
// var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
// if (!string.IsNullOrEmpty(username))
// {
// exchangeReceipt.Worker = username;
// }
//}
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber);
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedIssue.ToString(),
@ -123,7 +123,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber)
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode)
{
var ret = new Wmsoutm()
{
@ -133,7 +133,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "",
wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length- 6) : exchangeOrder.Worker,
wmsoutm_dept = "",//根据Worker从UserDepartment中获取
wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取
// wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
wmsoutm_cust = "",

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

@ -53,17 +53,17 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
#region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedReceiptNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(wmsReceipt);
//var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
//var departmentCode = department == null ? "" : department.Code;
if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
{
var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
if (!string.IsNullOrEmpty(username))
{
exchangeReceipt.Worker = username;
}
}
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber);
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
//if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
//{
// var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
// if (!string.IsNullOrEmpty(username))
// {
// exchangeReceipt.Worker = username;
// }
//}
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
var outgoingToExternal = new OutgoingToExternal()
{
DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),
@ -123,7 +123,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber)
private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode)
{
var ret = new Wmsoutm()
@ -134,7 +134,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "",
wmsoutm_user = exchangeOrder.Worker.Length>=6? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length-6) : exchangeOrder.Worker,
wmsoutm_dept = "",//根据Worker从UserDepartment中获取
wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取
//wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
wmsoutm_cust = "",

Loading…
Cancel
Save