diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index f49ab7ca3..958be6180 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -27,6 +27,7 @@ import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder;
 import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
 import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
@@ -2131,4 +2132,12 @@ public class StockInOrderApplicationService {
     public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
         return stockInOrderDomainService.queryInStockInfoByInOrderNumber(stockInOrderDTO);
     }
+
+    public List<StockInOrderPO> queryNoticePrint(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderDomainService.queryNoticePrint(stockInOrderDTO);
+    }
+
+    public List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderDomainService.queryNoticePrintDetail(stockInOrderDTO);
+    }
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java
index 6ea6c63d8..f9c0b4792 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java
@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.stockInOrder.repository.facade;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
@@ -43,4 +44,8 @@ public interface IStockInOrderService extends IService<StockInOrder>
     public StockInOrderPO getInfo(Long inOrderId);
 
     List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO);
+
+    List<StockInOrderPO> queryNoticePrint(StockInOrderDTO dto);
+
+    List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDTO stockInOrderDTO);
 }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java
index ffb72fe71..254a43952 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java
@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.stockInOrder.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
@@ -22,4 +23,8 @@ public interface StockInOrderMapper extends BaseMapper<StockInOrder>
     public List<StockInOrderPO> queryList(StockInOrderDO stockInOrderDO);
 
     List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO);
+
+    List<StockInOrderPO> queryNoticePrint(StockInOrderDTO stockInOrderDTO);
+
+    List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDTO stockInOrderDTO);
 }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java
index d42b7d7fe..851f76606 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java
@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.stockInOrder.repository.persistence;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService;
 import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
@@ -88,4 +89,14 @@ public class StockInOrderImpl extends ServiceImpl<StockInOrderMapper, StockInOrd
     public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
         return stockInOrderMapper.queryInStockInfoByInOrderNumber(stockInOrderDTO);
     }
+
+    @Override
+    public List<StockInOrderPO> queryNoticePrint(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderMapper.queryNoticePrint(stockInOrderDTO);
+    }
+
+    @Override
+    public List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderMapper.queryNoticePrintDetail(stockInOrderDTO);
+    }
 }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
index af844884d..332c021c0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
@@ -404,4 +404,22 @@ public class StockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("状态名称")
     private String statusName;
 
+    @ApiModelProperty("件数")
+    private BigDecimal pieceCount;
+
+    @ApiModelProperty("净重")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("毛重")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("单位")
+    private String unitCode;
+
+    @ApiModelProperty("包装名称")
+    private String packName;
+
+    @ApiModelProperty("仓位名称")
+    private String storageLocationName;
+
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
index 83f54a3cb..12bcbbb7b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
@@ -839,4 +839,12 @@ public class StockInOrderDomainService {
     public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
         return stockInOrderService.queryInStockInfoByInOrderNumber(stockInOrderDTO);
     }
+
+    public List<StockInOrderPO> queryNoticePrint(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderService.queryNoticePrint(stockInOrderDTO);
+    }
+
+    public List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderService.queryNoticePrintDetail(stockInOrderDTO);
+    }
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
index b16947a36..82089ffcc 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
@@ -7,6 +7,7 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
@@ -21,7 +22,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
@@ -184,4 +187,17 @@ public class StockInOrderApi extends BaseController {
         return AjaxResult.success(list);
     }
 
+    @ApiOperation("入仓通知单打印查询")
+    @PostMapping("/queryNoticePrint")
+    public AjaxResult queryNoticePrint(@RequestBody StockInOrderDTO stockInOrderDTO) {
+        List<StockInOrderPO> headerList  = stockInOrderApplicationService.queryNoticePrint(stockInOrderDTO);
+        List<InMaterialDetailPO> 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_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
index 1fe70631f..fb84d202d 100644
--- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
@@ -85,6 +85,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="salesmanId"    column="SALESMAN_ID"    />
         <result property="salesmanName"    column="SALESMAN_NAME"    />
         <result property="settlementCurrency"    column="SETTLEMENT_CURRENCY"    />
+        <result property="materialQuantity"    column="material_quantity"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="pieceCount"    column="piece_count"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="unitCode"    column="unit_code"    />
+        <result property="packName"    column="pack_name"    />
+        <result property="storageLocationName"    column="storage_location_name"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -466,4 +475,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY imd.material_detail_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 stock_in_order a
+        WHERE a.del_flag = 1
+          AND a.in_order_number = #{inOrderNumber}
+    </select>
+
+
+
+
+
+    <resultMap type="com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO" id="MaterialDetailResult">
+        <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>
+
+
+
+    <select id="queryNoticePrintDetail" resultMap="MaterialDetailResult">
+        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 in_material_detail b
+        WHERE b.del_flag = 1
+          AND b.in_order_number = #{inOrderNumber}
+        ORDER BY b.material_code
+    </select>
+
+
 </mapper>
\ No newline at end of file