发测试;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -657,17 +657,25 @@ public class ReservationStockInOrderDomainService {
             ReservationStockInOrder byId = stockInOrderService.getById(inOrderId);
             String inOrderNumber = byId.getInOrderNumber();
             List<ReservationInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReservationInMaterialDetail>().lambda().eq(ReservationInMaterialDetail::getInOrderNumber, inOrderNumber));
-
+            Long warehouseId1 = byId.getWarehouseId();
+            String warehouseCode1 = byId.getWarehouseCode();
+            String warehouseName1 = byId.getWarehouseName();
             // 按照 warehouseId 分组
             Map<Long, List<ReservationInMaterialDetail>> materialDetailGroupByWarehouse = materialDetailList.stream()
                     .collect(Collectors.groupingBy(ReservationInMaterialDetail::getWarehouseId));
             materialDetailGroupByWarehouse.forEach((warehouseId, details) -> {
+                if (warehouseId == null) warehouseId = warehouseId1;
+
                 Long topOrgId = reservationStockInOrderMapper.getTopOrgId(warehouseId);
                 Long orgId = reservationStockInOrderMapper.getOrgId(warehouseId);
                 String orgName = reservationStockInOrderMapper.getOrgName(warehouseId);
                 String warehouseCode = reservationStockInOrderMapper.getWarehouseCode(warehouseId);
                 String warehouseName = reservationStockInOrderMapper.getWarehouseName(warehouseId);
 
+
+                if (warehouseCode == null) warehouseCode = warehouseCode1;
+                if (warehouseName == null) warehouseName = warehouseName1;
+
                 ExecutionStockInOrder reservationStockInOrder = new ExecutionStockInOrder();
                 BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime");
                 reservationStockInOrder.setIssueStatus(0);

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -478,6 +478,9 @@ public class ReservationStockOutOrderDomainService {
 
         for (Long inOrderId : inOrderIds) {
             ReservationStockOutOrder byId = stockOutOrderService.getById(inOrderId);
+            Long warehouseId1 = byId.getWarehouseId();
+            String warehouseCode1 = byId.getWarehouseCode();
+            String warehouseName1 = byId.getWarehouseName();
             String inOrderNumber = byId.getOutOrderNumber();
             List<ReservationOutMaterialDetail> materialDetailList = outMaterialDetailService.list(new QueryWrapper<ReservationOutMaterialDetail>().lambda().eq(ReservationOutMaterialDetail::getOutOrderNumber, inOrderNumber));
 
@@ -485,12 +488,16 @@ public class ReservationStockOutOrderDomainService {
             Map<Long, List<ReservationOutMaterialDetail>> materialDetailGroupByWarehouse = materialDetailList.stream()
                     .collect(Collectors.groupingBy(ReservationOutMaterialDetail::getWarehouseId));
             materialDetailGroupByWarehouse.forEach((warehouseId, details) -> {
+                if (warehouseId == null) warehouseId = warehouseId1;
                 Long topOrgId = reservationStockInOrderMapper.getTopOrgId(warehouseId);
                 Long orgId = reservationStockInOrderMapper.getOrgId(warehouseId);
                 String orgName = reservationStockInOrderMapper.getOrgName(warehouseId);
                 String warehouseCode = reservationStockInOrderMapper.getWarehouseCode(warehouseId);
                 String warehouseName = reservationStockInOrderMapper.getWarehouseName(warehouseId);
 
+                if (warehouseCode == null) warehouseCode = warehouseCode1;
+                if (warehouseName == null) warehouseName = warehouseName1;
+
                 ExecutionStockOutOrder reservationStockInOrder = new ExecutionStockOutOrder();
                 BeanUtils.copyProperties(byId, reservationStockInOrder,"outOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime");
                 reservationStockInOrder.setIssueStatus(0);