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 38d444074..300ff4ba4 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 @@ -52,18 +52,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(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(), @@ -85,7 +85,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter #endregion #region 明细 - var WipDetails = wmsReceipt.Details.GroupBy(r => new { r.Number, r.ItemCode, r.LocationErpCode }).Select(p => new UnplannedIssueNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode }); + var WipDetails = wmsReceipt.Details.GroupBy(r => new { r.Number, r.ItemCode, r.LocationErpCode, r.ProjCapacityCode, r.CaseCode }).Select(p => new UnplannedIssueNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode, ProjCapacityCode = p.Key.ProjCapacityCode, CaseCode = p.Key.CaseCode }); foreach (var detail in WipDetails) { var outgoingDetailToExternal = new OutgoingToExternal() @@ -123,7 +123,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// /// /// - 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 = "", @@ -163,8 +163,8 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_qty = exchangeDetailOrder.Qty, - wmsoutd_bcm_code = "",//有问题 - wmsoutd_projt_id = "",//有问题 + wmsoutd_bcm_code = string.IsNullOrEmpty( exchangeDetailOrder.ProjCapacityCode)?"": exchangeDetailOrder.ProjCapacityCode,//项目代码 + wmsoutd_projt_id = string.IsNullOrEmpty( exchangeDetailOrder.CaseCode)?"": exchangeDetailOrder.CaseCode,//专案代码 }; return ret; } 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 5688104f2..3b6d8b68e 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 @@ -53,17 +53,17 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(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(), @@ -85,7 +85,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter #endregion #region 明细 - var WipDetails = wmsReceipt.Details.GroupBy(r => new { r.Number, r.ItemCode, r.LocationErpCode }).Select(p => new UnplannedReceiptNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode }); + var WipDetails = wmsReceipt.Details.GroupBy(r => new { r.Number, r.ItemCode, r.LocationErpCode,r.ProjCapacityCode,r.CaseCode }).Select(p => new UnplannedReceiptNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode,ProjCapacityCode=p.Key.ProjCapacityCode,CaseCode=p.Key.CaseCode }); foreach (var detail in WipDetails) { @@ -123,7 +123,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// /// /// - 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 = "", @@ -164,8 +164,8 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_qty = exchangeDetailOrder.Qty, - wmsoutd_bcm_code = "",//有问题 - wmsoutd_projt_id = "",//有问题 + wmsoutd_bcm_code = string.IsNullOrEmpty(exchangeDetailOrder.ProjCapacityCode) ? "" : exchangeDetailOrder.ProjCapacityCode,//项目代码 + wmsoutd_projt_id = string.IsNullOrEmpty(exchangeDetailOrder.CaseCode) ? "" : exchangeDetailOrder.CaseCode,//专案代码 }; return ret; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs index 0f1d51105..f3c73ada1 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs @@ -31,4 +31,15 @@ public class UnplannedIssueNoteDetailExchangeDto /// [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs index 2cff333f6..d8567f572 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs @@ -32,4 +32,15 @@ public class UnplannedReceiptNoteDetailExchangeDto /// [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { 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 09555ffdd..db237fa5f 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 @@ -1641,6 +1641,16 @@ 数量 + + + 专案 + + + + + 项目分类 + + 单据号 @@ -1686,6 +1696,16 @@ 数量 + + + 专案 + + + + + 项目分类 + + 单据号 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs index 0a5debbca..9d1d9df4b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs @@ -47,7 +47,6 @@ public class CountAdjustNoteEventHandler { await _countAdjustRequestApp.CompleteByNumberAsync(entity.CountAdjustRequestNumber).ConfigureAwait(false); } - } [UnitOfWork]