From e427b9c9b5b42c2b2ea1b431426fa4d86d15bd96 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 28 Nov 2023 15:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=AE=B1=E5=A2=9E=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/TestController.cs | 4 ++-- src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs | 2 +- src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index d5e9c663..7c1f09e7 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -49,11 +49,11 @@ namespace WMS.Web.Api.Controllers public async Task TestHJ() { //var c = await _erpService.BillQueryForSubStock(null,null); - //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); + var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); - var b = await _outStockTaskService.Sync(new List() { "CKRW00000346" }); + //var b = await _outStockTaskService.Sync(new List() { "FHTZD8022232" }); //var result = await this._outStockTaskService.Sync(null); //var t=await _outStockTaskRepositories.Get(1); // t.Details[0].Remark = "sdf"; diff --git a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs index 84377c0a..c4183075 100644 --- a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs @@ -17,7 +17,7 @@ namespace WMS.Web.Domain.IService public interface IChangeMoveBoxService { //改箱保存 - Task ChangeBoxSave(List dto, LoginInDto loginInfo, bool isTransaction=true); + Task ChangeBoxSave(List dto, LoginInDto loginInfo, bool isTransaction=true,bool IsInventory=true); //移箱保存 Task MoveBoxSave(List dto, bool IsUp, LoginInDto loginInfo); diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index fb67ca4c..0790da72 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -51,7 +51,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task ChangeBoxSave(List dto, LoginInDto loginInfo, bool isTransaction = false) + public async Task ChangeBoxSave(List dto, LoginInDto loginInfo, bool isTransaction = false, bool IsInventory = true) { //1.有原箱时 需要判断 物料对应的序列号是否存在 var srcIds = dto.Select(s => s.SrcBoxId).ToList(); @@ -146,7 +146,7 @@ namespace WMS.Web.Domain.Services isSuccess = await _boxRepositories.EditEntityList(boxList, false); if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); } - if (res_Rollback.IsSuccess) + if (res_Rollback.IsSuccess && IsInventory) { var res_Inventory = await _boxInventoryService.GenerateChangeBox(list, false); if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;