From a191bc91f88bd3477362d26868f9d0324fa1d50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 8 Jan 2025 08:55:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index 1c90136f4..a8c8d3f58 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -941,7 +941,7 @@ public class AssembleIssueJobAppService { foreach (var detail in entity.Details) { - var detailDto = new KittingIssueJobDetailDTO(); + var detailDto = new AssembleIssueJobDetailDTO(); if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode)) { var fromloc = new LocationDTO(); From 7e7720293ad9a10fbbc533223109cde576893a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 8 Jan 2025 09:12:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferNotes/TransferNoteAppService.cs | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 4b69e0b91..ac2c9ba33 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -78,7 +78,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase IPostionLocationAppService postionLocationAppService, IItemBasicAppService itemBasicAppService, UnitOfWorkManager unitOfWorkManager, - IProductionLineAppService _productionLineAppService, + IProductionLineAppService productionLineAppService, IExpectOutAppService expectOutAppService) : base(repository) { _unitOfWorkManager = unitOfWorkManager; @@ -96,6 +96,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase _agvOptions = agvOptions; _postionLocationAppService = postionLocationAppService; _itemBasicAppService = itemBasicAppService; + _productionLineAppService = productionLineAppService; } #region 东阳使用 @@ -709,21 +710,30 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase { errors.Add($"来源起始点{detail.BeginPosition}库位没查到"); } + var productionline = await _productionLineAppService.GetByLocationCodeAsync(fromlocation.Code).ConfigureAwait(false); + if (productionline == null) + { + errors.Add($"结束点{detail.BeginPosition}库位不在生产线中!"); + } + + + + + LocationDTO tolocation = await _locationAppService.GetByCodeAsync(detail.EndPosition).ConfigureAwait(false); if (tolocation == null) { errors.Add($"结束点{detail.EndPosition}库位没查到"); } - var productionline=await _productionLineAppService.GetByLocationCodeAsync(tolocation.Code).ConfigureAwait(false); - if (productionline == null) - { - errors.Add($"结束点{detail.EndPosition}库位不在生产线中!"); - } + + + + - transfer.Type = productionline.ProductionLineType.ToString(); + From 7811cd334203fc2c0edf1afd79e2ca14aed50760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 8 Jan 2025 10:00:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferNotes/TransferNoteAppService.cs | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index ac2c9ba33..961a1302c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -702,7 +702,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase var transferNoteDetailInputs = new List(); var detailInput = new TransferNoteDetailInput(); - var fromlocation = await _locationAppService.GetByCodeAsync(detail.BeginPosition).ConfigureAwait(false); @@ -710,17 +709,21 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase { errors.Add($"来源起始点{detail.BeginPosition}库位没查到"); } - var productionline = await _productionLineAppService.GetByLocationCodeAsync(fromlocation.Code).ConfigureAwait(false); - if (productionline == null) + + if (detail.OrderType != "50" && detail.OrderType != "51") { - errors.Add($"结束点{detail.BeginPosition}库位不在生产线中!"); + throw new UserFriendlyException("类型不是MES冻结解冻或完工转储类型(50、51)"); } + if(detail.OrderType=="51") + { + var productionline = await _productionLineAppService.GetByLocationCodeAsync(fromlocation.Code).ConfigureAwait(false); + if (productionline == null) + { + errors.Add($"结束点{detail.BeginPosition}库位不在生产线中!"); + } + } - - - - LocationDTO tolocation = await _locationAppService.GetByCodeAsync(detail.EndPosition).ConfigureAwait(false); if (tolocation == null) { @@ -728,16 +731,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase } - - - - - - - - - - //switch (tolocation.WarehouseCode) //{ // case "APA-KWZ":// 装配线边库位组 From 33bd5367c2537a8351b7ee795d54924f57ba3fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 8 Jan 2025 11:14:51 +0800 Subject: [PATCH 4/6] UP --- .../Notes/TransferNotes/TransferNoteAppService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 961a1302c..bc856a819 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -710,12 +710,12 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase errors.Add($"来源起始点{detail.BeginPosition}库位没查到"); } - if (detail.OrderType != "50" && detail.OrderType != "51") + if (detail.OrderType != "90" && detail.OrderType != "1") { throw new UserFriendlyException("类型不是MES冻结解冻或完工转储类型(50、51)"); } - if(detail.OrderType=="51") + if(detail.OrderType=="1") { var productionline = await _productionLineAppService.GetByLocationCodeAsync(fromlocation.Code).ConfigureAwait(false); if (productionline == null) From f8198d2a5b0fc8e2b7b4c014b4f4ebfef70ee5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 8 Jan 2025 11:49:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KittingIssueRequests/KittingIssueRequestAppService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs index 1187f1a9c..89c2eec9c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs @@ -326,7 +326,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase Date: Wed, 8 Jan 2025 16:52:43 +0800 Subject: [PATCH 6/6] up --- .../AssembleIssueJobs/AssembleIssueJobAppService.cs | 5 +++-- .../IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs | 2 ++ .../InjectionIssueJobs/InjectionIssueJobAppService.cs | 3 +++ .../IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs | 2 ++ .../SparePartIssueJobs/SparePartIssueJobAppService.cs | 2 ++ .../KittingIssueRequests/KittingIssueRequestAppService.cs | 3 --- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index a8c8d3f58..f0b11ec1b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -920,8 +920,9 @@ public class AssembleIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { - - if(request.Data.Count==0) + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + + if (request.Data.Count==0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); } 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 a2d5889e3..ed373fa31 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 @@ -933,6 +933,8 @@ public class CoatingIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index d3d0ca3a3..a0d570f9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -892,6 +892,9 @@ public class InjectionIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); 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 9b5938c9c..d7b039baa 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 @@ -894,6 +894,8 @@ public class KittingIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index 43704c671..3b94d313c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -893,6 +893,8 @@ public class SparePartIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs index 89c2eec9c..2c565672c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs @@ -306,10 +306,8 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase @@ -319,7 +317,6 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase p.HandledToQty); } - requestDetail.IssuedQty = allIssuedQty; requestDetail.ReceivedQty = allReceivedQty; }