Browse Source

更新

dev_DY_CC
赵新宇 12 months ago
parent
commit
729004b4f8
  1. 40
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
  2. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs
  3. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs
  4. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs
  5. 33
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
  6. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs

40
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@ -771,46 +771,6 @@
最后修改时间 最后修改时间
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteDetailExchangeDto.ToLocationErpCode">
<summary>
目标ERP库位
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteDetailExchangeDto.FromLocationErpCode">
<summary>
来源ERP库位
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteDetailExchangeDto.Qty">
<summary>
数量
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteDetailExchangeDto.ItemCode">
<summary>
物品代码
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteExchangeDto.Number">
<summary>
发料记录号
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteExchangeDto.ActiveDate">
<summary>
生效日期
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteExchangeDto.Worker">
<summary>
操作员
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.AssembleIssueNoteExchangeDto.Detail">
<summary>
明细
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.IssueNoteDetailExchangeDto.ToLocationErpCode"> <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.IssueNoteDetailExchangeDto.ToLocationErpCode">
<summary> <summary>
目标ERP库位 目标ERP库位

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs

@ -45,4 +45,12 @@ public class ChassisDTO : SfsBasicDTOBase
/// </summary> /// </summary>
[Display(Name = "执行位置排序列")] [Display(Name = "执行位置排序列")]
public long SortNumber { get; set; } public long SortNumber { get; set; }
public string ItemCode { get; set; }
public string ItemName { get; set; }
public string ItemDesc1 { get; set; }
public string ItemDesc2 { get; set; }
} }

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs

@ -45,4 +45,12 @@ public class ChassisEditInput
/// </summary> /// </summary>
[Display(Name = "执行位置排序列")] [Display(Name = "执行位置排序列")]
public long SortNumber { get; set; } public long SortNumber { get; set; }
public string ItemCode { get; set; }
public string ItemName { get; set; }
public string ItemDesc1 { get; set; }
public string ItemDesc2 { get; set; }
} }

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs

@ -48,4 +48,12 @@ public class ChassisImportInput : SfsStoreImportInputBase
/// </summary> /// </summary>
[Display(Name = "执行位置排序列")] [Display(Name = "执行位置排序列")]
public long SortNumber { get; set; } public long SortNumber { get; set; }
public string ItemCode { get; set; }
public string ItemName { get; set; }
public string ItemDesc1 { get; set; }
public string ItemDesc2 { get; set; }
} }

33
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@ -72,7 +72,13 @@ public class KittingIssueJobAppService
await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false); await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false);
} }
return await base.CreateManyAsync(inputs).ConfigureAwait(false); var kittingIssueJobDtos=await base.CreateManyAsync(inputs).ConfigureAwait(false);
foreach (var kittingIssueJobDto in kittingIssueJobDtos)
{
await CheckDimensionalStorehouseAsync(kittingIssueJobDto).ConfigureAwait(false);
}
return kittingIssueJobDtos;
} }
[HttpPost("")] [HttpPost("")]
@ -81,7 +87,10 @@ public class KittingIssueJobAppService
await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false); await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false); await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false);
return await base.CreateAsync(input).ConfigureAwait(false); var kittingIssueJobDto=await base.CreateAsync(input).ConfigureAwait(false);
await CheckDimensionalStorehouseAsync(kittingIssueJobDto).ConfigureAwait(false);
return kittingIssueJobDto;
} }
[HttpPost("invalid")] [HttpPost("invalid")]
@ -284,14 +293,24 @@ public class KittingIssueJobAppService
if (loctionDto.Type == EnumLocationType.DimensionalStorehouse) if (loctionDto.Type == EnumLocationType.DimensionalStorehouse)
{ {
input.JobStatus = EnumJobStatus.Wait; input.JobStatus = EnumJobStatus.Wait;
}
}
/// <summary>
/// 判断是不是在立体库
/// </summary>
/// <param name="kittingIssueJobDto"></param>
/// <returns></returns>
private async Task CheckDimensionalStorehouseAsync(KittingIssueJobDTO kittingIssueJobDto)
{
var jobDetailInputdetail = kittingIssueJobDto.Details.FirstOrDefault();
var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
.ConfigureAwait(false);
if (loctionDto.Type == EnumLocationType.DimensionalStorehouse)
{
//TODO 立体库
//todo 调用立库接口
} }
} }

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs

@ -46,4 +46,12 @@ public class Chassis : SfsAggregateRootBase
/// </summary> /// </summary>
[Display(Name = "执行位置排序列")] [Display(Name = "执行位置排序列")]
public long SortNumber { get; set; } public long SortNumber { get; set; }
public string ItemCode { get; set; }
public string ItemName { get; set; }
public string ItemDesc1 { get; set; }
public string ItemDesc2 { get; set; }
} }

Loading…
Cancel
Save