From 266b0b34d38362d2ae2b8258dce3a9bd17f7c3ee Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Sat, 11 May 2024 10:03:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BA=95=E7=9B=98=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9Kitting=E7=AB=8B=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Chassis/DTOs/ChassisDTO.cs | 8 ++++++++ .../Chassis/Inputs/ChassisEditInput.cs | 8 ++++++++ .../Chassis/Inputs/ChassisImportInput.cs | 8 ++++++++ .../KittingIssueJobAppService.cs | 20 +++++++++++++++++-- .../Chassis/Chassis.cs | 8 ++++++++ 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs index 54dc81533..04352fd9b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs @@ -45,4 +45,12 @@ public class ChassisDTO : SfsBasicDTOBase /// [Display(Name = "执行位置排序列")] 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; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs index d3265a664..f4510380e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs @@ -45,4 +45,12 @@ public class ChassisEditInput /// [Display(Name = "执行位置排序列")] 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; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs index 538b52051..cfa5d46e1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs @@ -48,4 +48,12 @@ public class ChassisImportInput : SfsStoreImportInputBase /// [Display(Name = "执行位置排序列")] 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; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index 025cf2437..05b1fb9af 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -56,7 +56,8 @@ public class KittingIssueJobAppService await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false); } - return await base.CreateManyAsync(inputs).ConfigureAwait(false); + var kittingIssueJobDtos=await base.CreateManyAsync(inputs).ConfigureAwait(false); + } [HttpPost("")] @@ -268,8 +269,23 @@ public class KittingIssueJobAppService if (loctionDto.Type == EnumLocationType.DimensionalStorehouse) { input.JobStatus = EnumJobStatus.Wait; + } + } + /// + /// 判断是不是在立体库 + /// + /// + /// + private async Task CheckDimensionalStorehouseAsync(KittingIssueJob kittingIssueJob) + { + var jobDetailInputdetail = kittingIssueJob.Details.FirstOrDefault(); - //todo 调用立库接口 + var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) + .ConfigureAwait(false); + + if (loctionDto.Type == EnumLocationType.DimensionalStorehouse) + { + //TODO 立体库 } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs index 3113a77c2..0bd12d807 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs @@ -46,4 +46,12 @@ public class Chassis : SfsAggregateRootBase /// [Display(Name = "执行位置排序列")] 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; } }