diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 7bd508546..50fa90ea8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -197,9 +197,9 @@ public class HandoverTaskOrderDomainService { inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId()); inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName()); inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrder.getTopOrganizationId()); - inventoryAdjustmentRecord.setWarehouseCode(materialInventoryPO.getWarehouseCode()); - inventoryAdjustmentRecord.setWarehouseName(materialInventoryPO.getWarehouseName()); - inventoryAdjustmentRecord.setWarehouseId(materialInventoryPO.getWarehouseId()); + inventoryAdjustmentRecord.setWarehouseCode(stockOutOrder.getWarehouseCode()); + inventoryAdjustmentRecord.setWarehouseName(stockOutOrder.getWarehouseName()); + inventoryAdjustmentRecord.setWarehouseId(stockOutOrder.getWarehouseId()); inventoryAdjustmentRecord.setStorageCode(materialInventoryPO.getStorageCode()); inventoryAdjustmentRecord.setStorageName(materialInventoryPO.getStorageName()); inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId()); 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 66b0b3050..73700d38f 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 @@ -31,6 +31,8 @@ import com.mhd.wms.domain.outMaterialDetailSerialNumber.entity.OutMaterialDetail import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.facade.IOutMaterialDetailSerialNumberService; import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO; import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail; +import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; +import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +68,8 @@ public class OutMaterialDetailImpl extends ServiceImpl outMaterialDetailList,StockOutOrderPO stockOutOrderPO,LoginUser loginUser) { + StockOutOrder stockOutOrder = stockOutOrderMapper.selectById(stockOutOrderPO.getOutOrderId()); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity(); @@ -325,12 +330,12 @@ public class OutMaterialDetailImpl extends ServiceImpl