From 8898a4e798dd6f7ea95897fcc0b89dbdbf8a17fb Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Sat, 18 Apr 2026 15:30:17 +0800
Subject: [PATCH] =?UTF-8?q?oms-=E5=85=A5=E4=BB=93=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IReservationStockInOrderService.java      |  4 ++
 .../mapper/ReservationStockInOrderMapper.java |  5 +-
 .../ReservationStockInOrderImpl.java          | 12 ++++
 ...rvationStockInOrderApplicationService.java | 14 +++++
 .../ReservationStockInOrderDomainService.java |  8 +++
 .../ReservationStockInOrderApi.java           | 19 ++++++
 .../ReservationStockInOrderMapper.xml         | 63 +++++++++++++++++++
 7 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
index 973534596..1f19dc33e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
@@ -1,6 +1,7 @@
 package com.mhd.oms.domain.reservationStockInOrder.repository.facade;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
 import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
@@ -41,4 +42,7 @@ public interface IReservationStockInOrderService extends IService<ReservationSto
      * 查询入库单
      */
     public ReservationStockInOrderPO getInfo(Long inOrderId);
+
+    List<ReservationStockInOrderPO> queryNoticePrint(ReservationStockInOrderDO stockInOrderDO);
+    List<ReservationInMaterialDetailPO> queryNoticePrintDetail(ReservationStockInOrderDO stockInOrderDTO);
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
index 1eb1b28cd..78349d1c1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
@@ -1,6 +1,7 @@
 package com.mhd.oms.domain.reservationStockInOrder.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
 import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRulePO;
@@ -32,4 +33,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
 
     public MaterialGoodsRulePO getGoodsInfoByMaterialBaseInfoIds(@Param("id") Long id);
 
-}
\ No newline at end of file
+
+    List<ReservationStockInOrderPO> queryNoticePrint(ReservationStockInOrderDO stockInOrderDO);
+    List<ReservationInMaterialDetailPO> queryNoticePrintDetail(ReservationStockInOrderDO stockInOrderDO);}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 6dc46ea43..12698bdcc 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -1,6 +1,7 @@
 package com.mhd.oms.domain.reservationStockInOrder.repository.persistence;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
 import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
 import com.mhd.oms.domain.reservationStockInOrder.repository.facade.IReservationStockInOrderService;
 import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper;
@@ -81,4 +82,15 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         BeanUtils.copyProperties(stockInOrder,stockInOrderPO);
         return stockInOrderPO;
     }
+
+    @Override
+    public List<ReservationStockInOrderPO> queryNoticePrint(ReservationStockInOrderDO stockInOrderDO) {
+        return stockInOrderMapper.queryNoticePrint(stockInOrderDO);
+    }
+
+    @Override
+    public List<ReservationInMaterialDetailPO> queryNoticePrintDetail(ReservationStockInOrderDO stockInOrderDO) {
+        return stockInOrderMapper.queryNoticePrintDetail(stockInOrderDO);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
index 57d588f4b..36cff4dd6 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
@@ -10,8 +10,10 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
+import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.UserServiceFeign;
 import com.mhd.system.api.domain.InMaterialDetail;
@@ -23,6 +25,7 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -1890,4 +1893,15 @@ public class ReservationStockInOrderApplicationService {
         }
     }
 
+    public List<ReservationStockInOrderPO> queryNoticePrint(ReservationStockInOrderDTO stockInOrderDTO) {
+        ReservationStockInOrderDO stockInOrderDO = new ReservationStockInOrderDO();
+        BeanUtils.copyProperties(stockInOrderDTO, stockInOrderDO);
+        return stockInOrderDomainService.queryNoticePrint(stockInOrderDO);
+    }
+
+    public List<ReservationInMaterialDetailPO> queryNoticePrintDetail(ReservationStockInOrderDTO stockInOrderDTO) {
+        ReservationStockInOrderDO stockInOrderDO = new ReservationStockInOrderDO();
+        BeanUtils.copyProperties(stockInOrderDTO, stockInOrderDO);
+        return stockInOrderDomainService.queryNoticePrintDetail(stockInOrderDO);
+    }
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
index a6d55e2fd..2a3765d6a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
@@ -921,4 +921,12 @@ public class ReservationStockInOrderDomainService {
         return camelCase.toString();
     }
 
+    public List<ReservationStockInOrderPO> queryNoticePrint(ReservationStockInOrderDO stockInOrderDO) {
+        return stockInOrderService.queryNoticePrint(stockInOrderDO);
+    }
+
+    public List<ReservationInMaterialDetailPO> queryNoticePrintDetail(ReservationStockInOrderDO stockInOrderDO) {
+        return stockInOrderService.queryNoticePrintDetail(stockInOrderDO);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
index 7f0dd7b12..309a1f70e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
@@ -3,6 +3,7 @@ package com.mhd.oms.interfaces.facade.reservationStockInOrder;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
@@ -16,7 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 入库单Api
@@ -162,4 +165,20 @@ public class ReservationStockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.pushInOrderDetail(inMaterialDetail));
     }
 
+    /**
+     * 入仓通知单打印查询
+     */
+    @ApiOperation("入仓通知单打印查询")
+    @PostMapping("/queryNoticePrint")
+    public AjaxResult queryNoticePrint(@RequestBody ReservationStockInOrderDTO stockInOrderDTO) {
+        List<ReservationStockInOrderPO> headerList = stockInOrderApplicationService.queryNoticePrint(stockInOrderDTO);
+        List<ReservationInMaterialDetailPO> detailList = stockInOrderApplicationService.queryNoticePrintDetail(stockInOrderDTO);
+        Map<String, Object> result = new HashMap<>();
+        if (!headerList.isEmpty()) {
+            result.put("header", headerList.get(0));
+        }
+        result.put("detailList", detailList);
+        return AjaxResult.success(result);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 2eeeab0ce..7c60a377a 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -456,4 +456,67 @@
     <select id="getGoodsInfoByMaterialBaseInfoIds" parameterType="java.lang.Long" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRulePO">
         select * from "NGWL_TEST_WMS".MATERIAL_GOODS_RULE where MATERIAL_BASE_INFO_ID = #{id}
     </select>
+
+
+
+    <!-- 入仓通知单打印-表头查询 -->
+    <select id="queryNoticePrint" resultMap="StockInOrderResult">
+        SELECT
+            a.notice_number,
+            a.in_order_number,
+            a.status,
+            a.warehouse_name,
+            a.supplier_name,
+            a.shipper_name,
+            a.order_type_name,
+            a.expect_time,
+            a.material_quantity,
+            a.manufacturer,
+            a.contact_person,
+            a.tel,
+            a.vehicle_info,
+            a.delivery_address,
+            a.warehouse_date,
+            a.remark,
+            a.create_time
+        FROM reservation_stock_in_order a
+        WHERE a.del_flag = 1
+          AND a.in_order_id = #{inOrderId}
+    </select>
+
+    <!-- 入仓通知单打印-明细查询 -->
+    <select id="queryNoticePrintDetail" resultMap="ReservationInMaterialDetailResult">
+        SELECT
+            b.material_code,
+            b.material_name,
+            b.piece_count,
+            b.total_net_weight,
+            b.total_gross_weight,
+            b.unit_code,
+            b.pack_name,
+            b.batch_number,
+            b.storage_location_name,
+            b.quantity,
+            b.inbound_quantity
+        FROM reservation_in_material_detail b
+        WHERE b.del_flag = 1
+          AND b.in_order_number = #{inOrderNumber}
+        ORDER BY b.material_code
+    </select>
+
+    <!-- 明细结果映射 -->
+    <resultMap type="com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO" id="ReservationInMaterialDetailResult">
+        <result property="materialCode" column="material_code"/>
+        <result property="materialName" column="material_name"/>
+        <result property="pieceCount" column="piece_count"/>
+        <result property="totalNetWeight" column="total_net_weight"/>
+        <result property="totalGrossWeight" column="total_gross_weight"/>
+        <result property="unitCode" column="unit_code"/>
+        <result property="packName" column="pack_name"/>
+        <result property="batchNumber" column="batch_number"/>
+        <result property="storageLocationName" column="storage_location_name"/>
+        <result property="quantity" column="quantity"/>
+        <result property="inboundQuantity" column="inbound_quantity"/>
+    </resultMap>
+
 </mapper>
\ No newline at end of file