diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index f0e390f00..55b5f0316 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -609,10 +609,12 @@ public class StockOutOrderApplicationService { String sheetRefNo = detail.getSheetRefNo(); String boxPalletNo = detail.getBoxPalletNo(); Long materialBaseInfoId = detail.getMaterialBaseInfoId(); + Long warehouseId = detail.getWarehouseId(); List materialInventories = materialInventoryMapper.selectList(new QueryWrapper().lambda() .eq(MaterialInventory::getBatchRefNo, batchRefNo) .eq(MaterialInventory::getSheetRefNo, sheetRefNo) .eq(MaterialInventory::getBoxPalletNo, boxPalletNo) + .eq(MaterialInventory::getWarehouseId, warehouseId) .eq(MaterialInventory::getMaterialBaseInfoId, materialBaseInfoId)); if (materialInventories == null || materialInventories.isEmpty()) { throw new ServiceException("库存不存在:" + batchRefNo + " " + sheetRefNo + " " + boxPalletNo); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index fb841f5af..2c9426bc3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -302,7 +302,6 @@ public class OutMaterialDetailImpl extends ServiceImpl { outMaterialDetail.setIsAllocated("1"); });