zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

非生产领退料worker传申请里的worker

master
lvzb 1 year ago
parent
e13504017f
commit
b9e810ac10
5 changed files with 40 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
  2. 13
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
  3. 5
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs
  4. 9
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs
  5. 10
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

12
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
View File

@ -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;
}
/// <summary>
@ -54,6 +57,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(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
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
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"),

13
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
View File

@ -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;
}
/// <summary>
@ -56,6 +58,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(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
/// </summary>
/// <param name="exchangeOrder"></param>
/// <returns></returns>
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"),

5
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs
View File

@ -27,4 +27,9 @@ public class UnplannedIssueNoteExchangeDto
/// 领料类别
/// </summary>
public EnumUnplannedIssueType UnplannedIssueType { get; set; }
/// <summary>
/// 计划外出库请求单号
/// </summary>
public string UnplannedIssueRequestNumber { get; set; }
}

9
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs
View File

@ -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
/// </summary>
public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
/// <summary>
/// 计划外入库请求单号
/// </summary>
public string UnplannedReceiptRequestNumber { get; set; }
}

10
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
View File

@ -1711,6 +1711,11 @@
领料类别
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.UnplannedIssueRequestNumber">
<summary>
计划外出库请求单号
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.Number">
<summary>
单据号
@ -1771,6 +1776,11 @@
退料类别
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteExchangeDto.UnplannedReceiptRequestNumber">
<summary>
计划外入库请求单号
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.User.IdentityUserExchangerDto.UserName">
<summary>
用户号码

Write Preview
Loading…
Cancel
Save