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

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

集成Redis
郑渤旭[Irelia] 1 year ago
parent
b5da0579a2 dbad5cc9eb
commit
563071ec8a
6 changed files with 74 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
  2. 32
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs
  3. 11
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs
  4. 11
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs
  5. 20
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
  6. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs

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

@ -52,18 +52,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
#region 主表 #region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedIssueNoteDTO>(outgoingFromWms.DataContent); var wmsReceipt = JsonSerializer.Deserialize<UnplannedIssueNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt); var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt);
//var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
//var departmentCode = department == null ? "" : department.Code; var departmentCode = department == null ? "" : department.Code;
if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
{ //{
var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
if (!string.IsNullOrEmpty(username)) // if (!string.IsNullOrEmpty(username))
{ // {
exchangeReceipt.Worker = username; // exchangeReceipt.Worker = username;
} // }
} //}
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
var outgoingToExternal = new OutgoingToExternal() var outgoingToExternal = new OutgoingToExternal()
{ {
DataType = EnumOutgoingDataType.UnplannedIssue.ToString(), DataType = EnumOutgoingDataType.UnplannedIssue.ToString(),
@ -85,7 +85,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
#endregion #endregion
#region 明细 #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) foreach (var detail in WipDetails)
{ {
var outgoingDetailToExternal = new OutgoingToExternal() var outgoingDetailToExternal = new OutgoingToExternal()
@ -123,7 +123,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
/// </summary> /// </summary>
/// <param name="exchangeOrder"></param> /// <param name="exchangeOrder"></param>
/// <returns></returns> /// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber) private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode)
{ {
var ret = new Wmsoutm() var ret = new Wmsoutm()
{ {
@ -133,7 +133,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
wmsoutm_stat = "Y", wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "", wmsoutm_tyrp_dt = "",
wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length- 6) : exchangeOrder.Worker, 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 = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"), wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
wmsoutm_cust = "", wmsoutm_cust = "",
@ -163,8 +163,8 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
wmsoutd_qty = exchangeDetailOrder.Qty, wmsoutd_qty = exchangeDetailOrder.Qty,
wmsoutd_bcm_code = "",//有问题 wmsoutd_bcm_code = string.IsNullOrEmpty( exchangeDetailOrder.ProjCapacityCode)?"": exchangeDetailOrder.ProjCapacityCode,//项目代码
wmsoutd_projt_id = "",//有问题 wmsoutd_projt_id = string.IsNullOrEmpty( exchangeDetailOrder.CaseCode)?"": exchangeDetailOrder.CaseCode,//专案代码
}; };
return ret; return ret;
} }

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

@ -53,17 +53,17 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
#region 主表 #region 主表
var wmsReceipt = JsonSerializer.Deserialize<UnplannedReceiptNoteDTO>(outgoingFromWms.DataContent); var wmsReceipt = JsonSerializer.Deserialize<UnplannedReceiptNoteDTO>(outgoingFromWms.DataContent);
var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(wmsReceipt); var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(wmsReceipt);
//var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
//var departmentCode = department == null ? "" : department.Code; var departmentCode = department == null ? "" : department.Code;
if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
{ //{
var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
if (!string.IsNullOrEmpty(username)) // if (!string.IsNullOrEmpty(username))
{ // {
exchangeReceipt.Worker = username; // exchangeReceipt.Worker = username;
} // }
} //}
var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode);
var outgoingToExternal = new OutgoingToExternal() var outgoingToExternal = new OutgoingToExternal()
{ {
DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(), DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),
@ -85,7 +85,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
#endregion #endregion
#region 明细 #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) foreach (var detail in WipDetails)
{ {
@ -123,7 +123,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
/// </summary> /// </summary>
/// <param name="exchangeOrder"></param> /// <param name="exchangeOrder"></param>
/// <returns></returns> /// <returns></returns>
private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber) private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode)
{ {
var ret = new Wmsoutm() var ret = new Wmsoutm()
@ -134,7 +134,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
wmsoutm_stat = "Y", wmsoutm_stat = "Y",
wmsoutm_tyrp_dt = "", wmsoutm_tyrp_dt = "",
wmsoutm_user = exchangeOrder.Worker.Length>=6? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length-6) : exchangeOrder.Worker, 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 = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"), wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
wmsoutm_cust = "", wmsoutm_cust = "",
@ -164,8 +164,8 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_part = exchangeDetailOrder.ItemCode,
wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
wmsoutd_qty = exchangeDetailOrder.Qty, wmsoutd_qty = exchangeDetailOrder.Qty,
wmsoutd_bcm_code = "",//有问题 wmsoutd_bcm_code = string.IsNullOrEmpty(exchangeDetailOrder.ProjCapacityCode) ? "" : exchangeDetailOrder.ProjCapacityCode,//项目代码
wmsoutd_projt_id = "",//有问题 wmsoutd_projt_id = string.IsNullOrEmpty(exchangeDetailOrder.CaseCode) ? "" : exchangeDetailOrder.CaseCode,//专案代码
}; };
return ret; return ret;
} }

11
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs
View File

@ -31,4 +31,15 @@ public class UnplannedIssueNoteDetailExchangeDto
/// </summary> /// </summary>
[Display(Name = "数量")] [Display(Name = "数量")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
/// <summary>
/// 专案
/// </summary>
[Display(Name = "专案")]
public string CaseCode { get; set; }
/// <summary>
/// 项目分类
/// </summary>
[Display(Name = "项目分类")]
public string ProjCapacityCode { get; set; }
} }

11
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs
View File

@ -32,4 +32,15 @@ public class UnplannedReceiptNoteDetailExchangeDto
/// </summary> /// </summary>
[Display(Name = "数量")] [Display(Name = "数量")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
/// <summary>
/// 专案
/// </summary>
[Display(Name = "专案")]
public string CaseCode { get; set; }
/// <summary>
/// 项目分类
/// </summary>
[Display(Name = "项目分类")]
public string ProjCapacityCode { get; set; }
} }

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

@ -1641,6 +1641,16 @@
数量 数量
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteDetailExchangeDto.CaseCode">
<summary>
专案
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteDetailExchangeDto.ProjCapacityCode">
<summary>
项目分类
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.Number"> <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.Number">
<summary> <summary>
单据号 单据号
@ -1686,6 +1696,16 @@
数量 数量
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.CaseCode">
<summary>
专案
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.ProjCapacityCode">
<summary>
项目分类
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteExchangeDto.Number"> <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteExchangeDto.Number">
<summary> <summary>
单据号 单据号

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CountAdjustNoteEventHandler.cs
View File

@ -47,7 +47,6 @@ public class CountAdjustNoteEventHandler
{ {
await _countAdjustRequestApp.CompleteByNumberAsync(entity.CountAdjustRequestNumber).ConfigureAwait(false); await _countAdjustRequestApp.CompleteByNumberAsync(entity.CountAdjustRequestNumber).ConfigureAwait(false);
} }
} }
[UnitOfWork] [UnitOfWork]

Write Preview
Loading…
Cancel
Save