diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index ea782465..935b876d 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -4267,7 +4267,7 @@ - + 出库单-箱库存变更 diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index be4b8a7a..8c6a14e8 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -546,9 +546,12 @@ namespace WMS.Web.Domain.Services } }); - + //是否要改箱的信息:直接调拨出库单,过来的出库就不要去改箱了 + var isChangeBoxInfo = true; + if (dtoData != null && dtoData.Type == OutStockType.Stkdirecttransfers) + isChangeBoxInfo = false; //提交处理 - var result = await this.ExeOutStockBox(generateDtoList, boxInventorys, isTransaction); + var result = await this.ExeOutStockBox(generateDtoList, boxInventorys, isChangeBoxInfo, isTransaction); if (!result.IsSuccess) return result; @@ -1698,7 +1701,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task ExeOutStockBox(List dtoDatas, List boxInventorys, bool isTransaction) + private async Task ExeOutStockBox(List dtoDatas, List boxInventorys, bool isChangeBoxInfo, bool isTransaction) { //1.判断来源数据是否存在 if (dtoDatas == null || dtoDatas.Count == 0) @@ -1799,9 +1802,12 @@ namespace WMS.Web.Domain.Services } //改箱 - var changeBox_result= await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction); - if(!changeBox_result.IsSuccess) - return changeBox_result; + if (isChangeBoxInfo) + { + var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction); + if (!changeBox_result.IsSuccess) + return changeBox_result; + } //4.数据库更新操作:更新和删除 var isSuccess = true;