From 34f2eeef04c4a60c2a40945b1483fbf2c9cf4f39 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 3 Jun 2024 13:14:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ocationNoteDbContextModelCreatingExtensions.cs | 4 ++-- .../Transactions/ThirdLocationNoteEventHandler.cs | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs index e4498d321..ad466fea8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs @@ -56,8 +56,8 @@ public static class ThirdLocationNoteDbContextModelCreatingExtensions //Relations //Indexes - b.HasIndex(q => new { q.Number, q.FromPackingCode, q.FromLocationCode, q.ToLocationCode }).IsUnique(); - b.HasIndex(q => new { q.FromPackingCode }); + //b.HasIndex(q => new { q.Number, q.ItemCode, q.FromLocationCode, q.ToLocationCode }).IsUnique(); + b.HasIndex(q => new { q.Number }); }); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs index 05a4e35c8..300e5a73a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs @@ -55,17 +55,18 @@ public class ThirdLocationNoteEventHandler if(requestEntities.Count>0 && entity.Details.Count>0) { bool isDone = false; - var requestDetail = requestEntities[0].Details.FirstOrDefault(p => p.ItemCode == entity.Details[0].ItemCode); - if(requestDetail != null) + foreach(var item in requestEntities[0].Details) { - requestDetail.ReceivedQty += entity.Details[0].HandledQty; - if(requestDetail.IssuedQty == requestDetail.ReceivedQty) + var noteDetail = entity.Details.FirstOrDefault(p => p.ItemCode == item.ItemCode); + if(noteDetail != null) { - isDone = true; + item.ReceivedQty += noteDetail.HandledQty; + } - } + + } - foreach(var item in requestEntities[0].Details.FindAll(p=>p.ItemCode!= entity.Details[0].ItemCode)) + foreach(var item in requestEntities[0].Details) { if(item.IssuedQty == item.ReceivedQty) { From af898a8d79024bacb5686358895e8b04a90f87df Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 3 Jun 2024 14:22:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=9B=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/CountJobs/CountJobManager.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs index 167428d17..acd5e6d6d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs @@ -22,16 +22,19 @@ public class CountJobManager : SfsJobManagerBase, ICou private readonly IBalanceAppService _balanceAppService; private readonly ICountJobRepository _repository; private readonly ICountNoteRepository _noteRepository; + private readonly ICountAdjustRequestRepository _countAdjustRequestRepository; public CountJobManager( ICountJobRepository repository, IBalanceAppService balanceAppService, - ICountNoteRepository noteRepository + ICountNoteRepository noteRepository, + ICountAdjustRequestRepository countAdjustRequestRepository ) : base(repository) { _noteRepository = noteRepository; _balanceAppService = balanceAppService; _repository = repository; + _countAdjustRequestRepository= countAdjustRequestRepository; } /// /// 根据选择的任务号码重置盘点任务 @@ -47,13 +50,13 @@ public class CountJobManager : SfsJobManagerBase, ICou { throw new UserFriendlyException($"所选任务属于多个盘点计划，无法重盘！"); } + var note = await _noteRepository.FindAsync(r => r.CountPlanNumber == planNumbers.First()).ConfigureAwait(false); + if (note != null && note.Adjusted == true) + { + throw new UserFriendlyException($"计划单号 【{note.CountPlanNumber}】生成了调整纪律，无法重盘"); + } foreach (var job in joblist) { - var note = await _noteRepository.FindAsync(r => r.CountJobNumber == job.Number).ConfigureAwait(false); - if (note != null && note.Adjusted == true) - { - throw new UserFriendlyException($"任务号 【{job.Number}】生成的记录【{note.Number}】已经进行了调整，无法重盘"); - } job.JobStatus = EnumJobStatus.Open; var details = job.Details.Where(r => r.InventoryStage == job.InventoryStage && r.InventoryQty != 0).ToList(); List newDetails = new List(); From ad179ddc3ab781e2d9b90c8e6f5485f5b9707d74 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 3 Jun 2024 14:30:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ThirdLocationJobManager.cs | 44 ++++++------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs index 977c851e1..c175b6355 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs @@ -49,36 +49,19 @@ public class ThirdLocationJobManager : SfsJobManagerBase p.ItemCode == entity.Details[0].ItemCode); - //if (jobDetail.RecommendQty == jobDetail.HandledQty + input.Details[0].HandledQty) - //{ - // jobDetail.HandledQty += input.Details[0].HandledQty; - // isDone = true; - //} - //else - //{ - // jobDetail.HandledQty = input.Details[0].HandledQty; - // isDone = false; - //} - - if (jobDetail.RecommendQty == input.Details[0].HandledQty) - { - jobDetail.HandledQty += input.Details[0].HandledQty; - jobDetail.RecommendQty= jobDetail.RecommendQty- input.Details[0].HandledQty; - jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob; - isDone = true; - } - else + foreach(var jobDetail in entity.Details) { - jobDetail.HandledQty += input.Details[0].HandledQty; - jobDetail.RecommendQty = jobDetail.RecommendQty - input.Details[0].HandledQty; - jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob; - isDone = false; - } + var inputDetail= input.Details.FirstOrDefault(p=>p.ItemCode== jobDetail.ItemCode); + jobDetail.HandledQty += inputDetail.HandledQty; + jobDetail.RecommendQty = jobDetail.RecommendQty - inputDetail.HandledQty; + jobDetail.SingleCodeJob = inputDetail.SingleCodeJob; + + inputDetail.RecommendQty = jobDetail.RecommendQty; + } - foreach (var item in entity.Details.FindAll(p => p.ItemCode != entity.Details[0].ItemCode)) + foreach (var item in entity.Details) { - if (item.RecommendQty == item.HandledQty) + if (item.RecommendQty == 0) { isDone = true; } @@ -91,15 +74,14 @@ public class ThirdLocationJobManager : SfsJobManagerBase