From d937a26cbdba38701a1037fa4b8936f1c214683a Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Sat, 11 May 2024 11:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoatingIssueJobAppService.cs | 223 +++++++++--------- .../KittingIssueJobAppService.cs | 14 +- 2 files changed, 119 insertions(+), 118 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index dd4d17441..f3bef2def 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -204,116 +204,121 @@ public class CoatingIssueJobAppService } - [HttpPost("sync-issue-job-stereo")] - public virtual async Task SyncCoatingJobStereoAsync(List input) - { - - ReusltObject ret=new ReusltObject(); - ret.Code = "1"; - ret.Message = "操作成功"; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); - - List IssueJobToRestoDetailDTOs = new List(); - IssueJobToRestoDTO main=new IssueJobToRestoDTO(); - main.OperatorName=CurrentUser.UserName; - foreach (var job in input) - { - foreach (var jobitem in job.Details) - { - IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO() - { - Count=jobitem.HandledToQty, - ProductNo=jobitem.ItemCode, - NeedSite=jobitem.HandledToLocationCode, - WorkNo=job.Number, - TaskNo=job.Number - }); - } - } - main.Details=IssueJobToRestoDetailDTOs; - - #region - IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient()); - ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); - #endregion - return ret; - - } - - - - - [HttpPost("receive-issue-job-stereo")] - public virtual async Task SyncReciveCoatingJobStereoAsync(IssueRequestFromRestoDTO input) - { - List errors = new List(); - var ret=new ReusltObject() - { - Code = "1", - OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), - Message = "操作成功" - }; - try - { - if (input.Jobs.Count > 0) - { - var inputs = input.Jobs; - var numbers = inputs.Select(p => p.JobNumber); - var query = _repository.WithDetails() - .Where(p => numbers.Contains(p.Number)); - var entities = query.ToList(); - - if (input.Jobs.Count == entities.Count) { - errors.Add("出库任务和WMS出库任务不符,请核对! \n"); - } - var dtos = ObjectMapper.Map, List>(entities); - foreach (var itm in dtos) - { - var first = inputs.FirstOrDefault(p => p.JobNumber == itm.Number); - List details = new List(); - foreach (var detail in first.Details) - { - CoatingIssueJobDetailDTO dto = new CoatingIssueJobDetailDTO(); - dto.HandledFromLocationCode = detail.FromLocationCode; - dto.HandledToLocationCode = detail.ToLocationCode; - dto.ItemCode = detail.ItemCode; - dto.RecommendFromQty = detail.Qty; - dto.RecommendToQty = detail.Qty; - dto.HandledFromQty = detail.Qty; - dto.HandledToQty = detail.Qty; - details.Add(dto); - } - itm.Details = details; - } - } - else - { - errors.Add("立体库确认单据里无数据! \n"); - } - } - catch (Exception ex) - { - ret=new ReusltObject() - { - Code = "2", - OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), - Message = ex.Message - }; - return ret; - } - - if (errors.Count > 0) - { + //[HttpPost("sync-issue-job-stereo")] + //public virtual async Task SyncCoatingJobStereoAsync(List input) + //{ + + // ReusltObject ret=new ReusltObject(); + // ret.Code = "1"; + // ret.Message = "操作成功"; + // ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); + + // List IssueJobToRestoDetailDTOs = new List(); + // IssueJobToRestoDTO main=new IssueJobToRestoDTO(); + // main.OperatorName=CurrentUser.UserName; + // foreach (var job in input) + // { + // foreach (var jobitem in job.Details) + // { + // IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO() + // { + // Count=jobitem.HandledToQty, + // ProductNo=jobitem.ItemCode, + // NeedSite=jobitem.HandledToLocationCode, + // WorkNo=job.Number, + // TaskNo=job.Number + // }); + // } + // } + // main.Details=IssueJobToRestoDetailDTOs; + + // #region + // IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient()); + // ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); + // #endregion + // return ret; + + //} + + + + + //[HttpPost("receive-issue-job-stereo")] + //public virtual async Task SyncReciveCoatingJobStereoAsync(IssueRequestFromRestoDTO input) + //{ + // List errors = new List(); + // var ret=new ReusltObject() + // { + // Code = "1", + // OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), + // Message = "操作成功" + // }; + // try + // { + // if (input.Jobs.Count > 0) + // { + // var inputs = input.Jobs; + // var numbers = inputs.Select(p => p.JobNumber); + // var query = _repository.WithDetails() + // .Where(p => numbers.Contains(p.Number)); + // var entities = query.ToList(); + + // if (input.Jobs.Count == entities.Count) { + // errors.Add("出库任务和WMS出库任务不符,请核对! \n"); + // } + // var dtos = ObjectMapper.Map, List>(entities); + // foreach (var itm in dtos) + // { + // var first = inputs.FirstOrDefault(p => p.JobNumber == itm.Number); + + // var itmDetails = itm.Details; + // List details = new List(); + // foreach (var detail in first.Details) + // { + // var entity=itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode); + // CoatingIssueJobDetailDTO dto = new CoatingIssueJobDetailDTO(); + // dto.HandledFromLocationCode = entity.HandledFromContainerCode; + // dto.HandledToLocationCode = entity.HandledToLocationCode; + // dto.ItemCode = detail.ItemCode; + // dto.RecommendFromQty = detail.Qty; + // dto.RecommendToQty = detail.Qty; + // dto.HandledFromQty = detail.Qty; + // dto.HandledToQty = detail.Qty; + // details.Add(dto); + // } + // itm.Details = details; + // await CompleteAsync(itm.Id, itm).ConfigureAwait(false); + // } + + // } + // else + // { + // errors.Add("立体库确认单据里无数据! \n"); + // } + // } + // catch (Exception ex) + // { + // ret=new ReusltObject() + // { + // Code = "2", + // OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), + // Message = ex.Message + // }; + // return ret; + // } + + // if (errors.Count > 0) + // { - ret= new ReusltObject() - { - Code = "2", - OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), - Message = string.Join(",",errors.ToArray()) - }; - } - return ret; - } + // ret= new ReusltObject() + // { + // Code = "2", + // OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), + // Message = string.Join(",",errors.ToArray()) + // }; + // } + // return ret; + //} 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 95417e852..0c8a5f2fe 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 @@ -437,18 +437,11 @@ public class KittingIssueJobAppService var query = _repository.WithDetails() .Where(p => numbers.Contains(p.Number)); var entities = query.ToList(); - var dtos = ObjectMapper.Map, List>(entities); - - if (input.Jobs.Count == entities.Count) { errors.Add("提交出库任务和WMS出库任务不符,请核对! \n"); } - - - - foreach (var itm in dtos) { var first = jobs.FirstOrDefault(p => p.JobNumber == itm.Number); @@ -456,17 +449,20 @@ public class KittingIssueJobAppService List details = new List(); foreach (var detail in first.Details) { + var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode); KittingIssueJobDetailDTO dto = new KittingIssueJobDetailDTO(); - dto.HandledFromLocationCode = detail.FromLocationCode; - dto.HandledToLocationCode = detail.ToLocationCode; + dto.HandledFromLocationCode = entity.HandledFromLocationCode; + dto.HandledToLocationCode = entity.HandledToLocationCode; dto.ItemCode = detail.ItemCode; dto.RecommendFromQty = detail.Qty; dto.RecommendToQty = detail.Qty; dto.HandledFromQty = detail.Qty; dto.HandledToQty = detail.Qty; + dto.Status =entity.Status; details.Add(dto); } itm.Details = details; + await CompleteAsync(itm.Id, itm).ConfigureAwait(false); } } else