修改分页插叙的方法

Merge branch 'develop' into dev_zhangke
feat(material): 添加同步查询功能
2026-03-03 10:59:05 +08:00 · 2026-03-03 10:57:20 +08:00 · 2026-02-28 14:59:29 +08:00 · 2026-02-28 14:42:51 +08:00 · 2026-02-28 09:42:59 +08:00 · 2026-02-28 09:38:42 +08:00
11 changed files with 189 additions and 174 deletions
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
@ -219,7 +219,7 @@ public class ComponentPackingController {
        ComponentPackingEditVO vo = getPackingInfo(packingId);
        Map<String, Object> variables = new HashMap<>();
        variables.put("info", vo.getPackingVO());
-        variables.put("pages", PdfPageDTO.create(vo.getPackingItemVO(), 16, new ComponentPackingItemVO()));
+        variables.put("pages", PdfPageDTO.create(vo.getPackingItemVO(), 12, new ComponentPackingItemVO()));
        String html = ThymeleafUtil.generator("/template/", "配件销售发货清单", ".html", variables);
        PdfGeneratorUtil.generatePdf("发货清单" + vo.getPackingVO().getNo(), html, response);
    }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 /**
 * 采购退货
 */
@ -72,7 +73,7 @@ public class PurchaseReturnController extends BaseController {
    @PostMapping("search")
    @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
    public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid @RequestBody ApplyReturnRequestSearchQO request) {
-        return returnRequestService.getApplyOrders(request);
+        return ApiResult.success(returnRequestService.getApplyOrders(request));
    }

    /**
@ -101,7 +102,8 @@ public class PurchaseReturnController extends BaseController {
    @PostMapping("searchPos")
    @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
    public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid @RequestBody GoodsReceiptSearchQO request) {
-        return returnRequestService.getGoodsReceipts(request);
+
+        return ApiResult.success(returnRequestService.getGoodsReceipts(request));
    }

    /**
--- a/nflg-wms-admin/src/main/resources/template/生产领料单.html
+++ b/nflg-wms-admin/src/main/resources/template/生产领料单.html
@ -7,19 +7,18 @@
    <style>
        @media print {
            @page {
-                size: landscape;
-                margin: 0;
+                size: A4 landscape;
            }
        }
        @page {
-            /*size: A4 landscape;*/
-            size: landscape;
-            margin: 0;
+            size: A4 landscape;
        }

        body {
-            width: 1425px;
-            height: 825px;
+            /*width: 1425px;*/
+            /*height: 825px;*/
+            width: 100%;
+            height: 100%;
            font-family: SimSun, monospace;
            font-size: 12pt;
            margin: 0;
@ -141,7 +140,7 @@
        }

        .package-logo {
-            width: 300px;
+            width: 250px;
            margin: 0 auto 20px;
            position: absolute;
        }
--- a/nflg-wms-admin/src/main/resources/template/配件销售发货清单.html
+++ b/nflg-wms-admin/src/main/resources/template/配件销售发货清单.html
@ -31,10 +31,18 @@

        .table-cell {
            float: left;
-            padding: 6px;
+            height: 50px;
+            padding: 10px;
            box-sizing: border-box;
            border-top: 1px solid #000;
            border-left: 1px solid #000;
+            text-align: center;
+        }
+
+        .table-cell-non-border {
+            float: left;
+            padding: 3px;
+            box-sizing: border-box;
            text-align: left;
            white-space: nowrap;
            overflow: hidden;
@ -60,134 +68,123 @@
            font-weight: bold;
            text-align: center;
            font-size: 18pt;
-            padding: 10px;
+            padding: 5px;
        }

        .cell-center {
            text-align: center;
        }
+        .data-title {
+            font-weight: bold;
+        }
+        .data-item{
+            padding: 17px;
+        }
+        table{
+            border-collapse: collapse;
+            width: 100%;
+        }
+        td,th{
+            padding: 5px;
+        }
+        .border td,tr,th{
+            border: 1px solid #000;
+        }
    </style>
 </head>
 <body>
 <div class="table-container" th:each="page,pageStat : ${pages}">
-    <div class="table-row first-row">
-        <div class="table-cell header-cell last-col" style="width: 100%">发货清单</div>
-    </div>
    <div class="table-row">
-        <div class="table-cell" style="width: 35%" th:text="${info.no}">ZL-4.15(3-04)</div>
-        <div class="table-cell" style="width: 35%">福建南方路面机械股份有限公司</div>
-        <div class="table-cell" style="width: 15%">装车号：V01</div>
-        <div class="table-cell last-col" style="width: 15%"
-             th:text="${#strings.isEmpty(info.cnum)?'&nbsp;':info.cnum}">&nbsp;</div>
-    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 9%">订单号</div>
-        <div class="table-cell" style="width: 11%" th:utext="${#strings.isEmpty(info.vbeln)?'&nbsp;':info.vbeln}">
-            1172000
-        </div>
-        <div class="table-cell cell-center" style="width: 8%">发货员</div>
-        <div class="table-cell" style="width: 8%" th:text="${#strings.isEmpty(info.uname)?'&nbsp;':info.uname}">程慧芳
-        </div>
-        <div class="table-cell cell-center" style="width: 13%">办事处/代理商</div>
-        <div class="table-cell" style="width: 11%" th:text="${#strings.isEmpty(info.pName)?'&nbsp;':info.pName}">测试
-        </div>
-        <div class="table-cell cell-center" style="width: 9%">发货日期</div>
-        <div class="table-cell" style="width: 11%"
-             th:text="${info.datum != null?#temporals.format(info.datum, 'yyyy-MM-dd'):'&nbsp;'}">
-            2025-08-04
-        </div>
-        <div class="table-cell cell-center" style="width: 9%">发运方式</div>
-        <div class="table-cell last-col" style="width: 11%"
-             th:text="${#strings.isEmpty(info.lBezei)?'&nbsp;':info.lBezei}">&nbsp;
+        <div class="table-cell-non-border header-cell" style="width: 100%">
+            福建南方路面机械股份有限公司<br/>Fujian South Highway Machinery Co., Ltd.
        </div>
    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 9%">设备编码</div>
-        <div class="table-cell" style="width: 11%" th:utext="${#strings.isEmpty(info.matnr)?'&nbsp;':info.matnr}">
-            22222222222
-        </div>
-        <div class="table-cell cell-center" style="width: 12%">收货人电话</div>
-        <div class="table-cell" style="width: 40%"
-             th:text="${#strings.isEmpty(info.gStrSuppl2)?'&nbsp;':info.gStrSuppl2}">于文强18365529799
-        </div>
-        <div class="table-cell cell-center" style="width: 8%">货单号</div>
-        <div class="table-cell last-col" style="width: 20%"
-             th:text="${#strings.isEmpty(info.huodh)?'&nbsp;':info.huodh}">0000
-        </div>
-    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 9%">收货单位</div>
-        <div class="table-cell" style="width: 40%" th:text="${#strings.isEmpty(info.lName)?'&nbsp;':info.lName}">
-            安徽华恒创远新材料有限责任公司
-        </div>
-        <div class="table-cell cell-center" style="width: 12%">签收人/电话</div>
-        <div class="table-cell last-col" style="width: 39%">&nbsp;</div>
-    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 9%">收货地址</div>
-        <div class="table-cell" style="width: 71%" th:text="${#strings.isEmpty(info.gStreen)?'&nbsp;':info.gStreen}">
-            安徽华恒创远新材料有限责任公司
-        </div>
-        <div class="table-cell cell-center" style="width: 9%">收货日期</div>
-        <div class="table-cell last-col" style="width: 11%">2025-08-04</div>
-    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 6%">司机</div>
-        <div class="table-cell" style="width: 14%" th:text="${#strings.isEmpty(info.bname)?'&nbsp;':info.bname}">
-            于文强
-        </div>
-        <div class="table-cell cell-center" style="width: 8%">驾驶证</div>
-        <div class="table-cell" style="width: 26%" th:text="${#strings.isEmpty(info.zjshz)?'&nbsp;':info.zjshz}">
-            51254685465465465
-        </div>
-        <div class="table-cell cell-center" style="width: 9%">车牌号</div>
-        <div class="table-cell" style="width: 12%" th:text="${#strings.isEmpty(info.zchep)?'&nbsp;':info.zchep}">
-            粤A12345
-        </div>
-        <div class="table-cell cell-center" style="width: 10%">司机电话</div>
-        <div class="table-cell last-col" style="width: 15%"
-             th:text="${#strings.isEmpty(info.telNumber)?'&nbsp;':info.telNumber}">18888888888
-        </div>
-    </div>
-    <div class="table-row">
-        <div class="table-cell cell-center" style="width: 6%">序号</div>
-        <div class="table-cell cell-center" style="width: 9%">配件编码</div>
-        <div class="table-cell cell-center" style="width: 39%">配件名称</div>
-        <div class="table-cell cell-center" style="width: 12%">货位号</div>
-        <div class="table-cell cell-center" style="width: 6%">单位</div>
-        <div class="table-cell cell-center" style="width: 8%">数量</div>
-        <div class="table-cell cell-center last-col" style="width: 20%">备注</div>
-    </div>
-    <div class="table-row" th:each="item,iterStat : ${page.datas}">
-        <div class="table-cell cell-center" style="width: 6%" th:text="${iterStat.count}">1</div>
-        <div class="table-cell cell-center" style="width: 9%"
-             th:text="${#strings.isEmpty(item.idnrk)?'&nbsp;':item.idnrk}">2100552783
-        </div>
-        <div class="table-cell" style="width: 39%" th:text="${#strings.isEmpty(item.ojtxb)?'&nbsp;':item.ojtxb}">
-            IH1213T.4 衬板6号
-        </div>
-        <div class="table-cell cell-center" style="width: 12%"
-             th:text="${#strings.isEmpty(item.lgpbe)?'&nbsp;':item.lgpbe}">E1-4-4
-        </div>
-        <div class="table-cell cell-center" style="width: 6%"
-             th:text="${#strings.isEmpty(item.meins)?'&nbsp;':item.meins}">PC
-        </div>
-        <div class="table-cell cell-center" style="width: 8%"
-             th:text="${#strings.isEmpty(item.outQty)?'&nbsp;':item.outQty}">20.000
-        </div>
-        <div class="table-cell last-col" style="width: 20%"
-             th:text="${#strings.isEmpty(item.zatwrt)?'&nbsp;':item.zatwrt}">&nbsp;
-        </div>
-    </div>
-    <div class="table-row last-row">
-        <div class="table-cell" style="width: 6%">&nbsp;</div>
-        <div class="table-cell" style="width: 9%">&nbsp;</div>
-        <div class="table-cell" style="width: 39%">&nbsp;</div>
-        <div class="table-cell" style="width: 12%">&nbsp;</div>
-        <div class="table-cell" style="width: 6%">&nbsp;</div>
-        <div class="table-cell" style="width: 8%">&nbsp;</div>
-        <div class="table-cell last-col" style="width: 20%">&nbsp;</div>
-    </div>
+    <table>
+        <tr>
+            <td style="width: 20%" rowspan="2"></td>
+            <td rowspan="2" style="text-align: center;font-size: 18pt;font-weight: bold">
+                发货清单<br/>Shipping List
+            </td>
+            <td style="width: 20%;border: 1px solid #000;">
+                <span class="data-title">货单编号</span><br/>Shipping Order Number
+            </td>
+        </tr>
+        <tr>
+            <td th:text="${info.no}" style="border: 1px solid #000;">
+                ZL-4.15(3-04)
+            </td>
+        </tr>
+    </table>
+    <table class="border">
+        <tr>
+            <td style="width: 15%"><span class="data-title">订单号</span><br/>Order No.</td>
+            <td style="width: 30%" colspan="2" th:text="${#strings.isEmpty(info.vbeln)?'&nbsp;':info.vbeln}">1172000</td>
+            <td style="width: 15%"><span class="data-title">设备编码</span><br/>Equipment Code</td>
+            <td colspan="3" th:text="${#strings.isEmpty(info.matnr)?'&nbsp;':info.matnr}">200012111</td>
+        </tr>
+        <tr>
+            <td><span class="data-title">收货单位</span><br/>Consignee Unit</td>
+            <td colspan="2" th:text="${#strings.isEmpty(info.lName)?'&nbsp;':info.lName}">安徽华恒创远新材料有限责任公司</td>
+            <td><span class="data-title">收货地址</span><br/>Consignee Address</td>
+            <td colspan="3" th:text="${#strings.isEmpty(info.gStreen)?'&nbsp;':info.gStreen}">1172000</td>
+        </tr>
+        <tr>
+            <td><span class="data-title">收货人/电话</span><br/>Consignee's Phone No.</td>
+            <td th:text="${#strings.isEmpty(info.gStrSuppl2)?'&nbsp;':info.gStrSuppl2}">于文强18365529799</td>
+            <td style="width: 15%"><span class="data-title">签收人/电话</span><br/>Signatory/Phone No.</td>
+            <td style="width: 25%" colspan="2"></td>
+            <td style="width: 10%"><span class="data-title">收货日期</span><br/>Receipt Date</td>
+            <td></td>
+        </tr>
+    </table>
+    <table class="border">
+        <tr>
+            <td style="width: 15%"><span class="data-title">发货员</span><br/>Dispatcher</td>
+            <td style="width: 15%" th:text="${#strings.isEmpty(info.uname)?'&nbsp;':info.uname}">程慧芳</td>
+            <td style="width: 15%"><span class="data-title">发货日期</span><br/>Shipping Date</td>
+            <td style="width: 10%" th:text="${info.datum != null?#temporals.format(info.datum, 'yyyy-MM-dd'):'&nbsp;'}">2025-08-04</td>
+            <td style="width: 15%"><span class="data-title">办事处/代理商</span><br/>Office/Agent</td>
+            <td colspan="3" th:text="${#strings.isEmpty(info.pName)?'&nbsp;':info.pName}">测试</td>
+        </tr>
+        <tr>
+            <td><span class="data-title">发运方式</span><br/>Shipping Method</td>
+            <td th:text="${#strings.isEmpty(info.lBezei)?'&nbsp;':info.lBezei}">汽车</td>
+            <td><span class="data-title">货单号</span><br/>Waybill No.</td>
+            <td th:text="${#strings.isEmpty(info.huodh)?'&nbsp;':info.huodh}">0000</td>
+            <td><span class="data-title">装车号</span><br/>Loading No.</td>
+            <td colspan="3" th:text="${#strings.isEmpty(info.cnum)?'&nbsp;':info.cnum}">V01</td>
+        </tr>
+        <tr>
+            <td><span class="data-title">车牌号</span><br/>License Plate No.</td>
+            <td th:text="${#strings.isEmpty(info.zchep)?'&nbsp;':info.zchep}">粤A12345</td>
+            <td><span class="data-title">司机</span><br/>Driver</td>
+            <td th:text="${#strings.isEmpty(info.bname)?'&nbsp;':info.bname}">于文强</td>
+            <td><span class="data-title">驾驶证</span><br/>Driver's License No.</td>
+            <td th:text="${#strings.isEmpty(info.zjshz)?'&nbsp;':info.zjshz}"></td>
+            <td style="width: 8%"><span class="data-title">电话</span><br/>Phone No.</td>
+            <td style="width: 10%" th:text="${#strings.isEmpty(info.telNumber)?'&nbsp;':info.telNumber}">18888888888</td>
+        </tr>
+    </table>
+    <table class="border" style="margin-top: 5px;">
+        <tr>
+            <td style="width: 10%"><span class="data-title">序号</span><br/>Serial No.</td>
+            <td style="width: 15%"><span class="data-title">配件编码</span><br/>Spare Part Code</td>
+            <td><span class="data-title">配件名称</span><br/>Spare Part Name</td>
+            <td style="width: 15%"><span class="data-title">货位号</span><br/>Storage Location No.</td>
+            <td style="width: 5%"><span class="data-title">单位</span><br/>Unit</td>
+            <td style="width: 5%"><span class="data-title">数量</span><br/>Quantity</td>
+            <td style="width: 10%"><span class="data-title">备注</span><br/>Remarks</td>
+        </tr>
+        <tr th:each="item,iterStat : ${page.datas}">
+            <td th:text="${iterStat.count}">1</td>
+            <td th:text="${#strings.isEmpty(item.idnrk)?'&nbsp;':item.idnrk}">2100552783</td>
+            <td style="text-align: left" th:text="${#strings.isEmpty(item.ojtxb)?'&nbsp;':item.ojtxb}">IH1213T.4 衬板6号</td>
+            <td th:text="${#strings.isEmpty(item.lgpbe)?'&nbsp;':item.lgpbe}">E1-4-4</td>
+            <td th:text="${#strings.isEmpty(item.meins)?'&nbsp;':item.meins}">PC</td>
+            <td th:text="${#strings.isEmpty(item.outQty)?'&nbsp;':item.outQty}">20.000</td>
+            <td th:text="${#strings.isEmpty(item.zatwrt)?'&nbsp;':item.zatwrt}">&nbsp;</td>
+        </tr>
+    </table>
 </div>
 </body>
 </html>
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
@ -1,6 +1,7 @@
 package com.nflg.wms.repository.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
@ -20,7 +21,7 @@ import com.nflg.wms.repository.entity.WmsReturnRequest;
 */
 public interface WmsReturnRequestMapper extends BaseMapper<WmsReturnRequest> {

-    ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(GoodsReceiptSearchQO request, Page<Object> objectPage);
+    IPage<GoodsReceiptVO> getGoodsReceipts(GoodsReceiptSearchQO request, Page<Object> objectPage);

-    ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(ApplyReturnRequestSearchQO request, Page<Object> objectPage);
+    IPage<ApplyReturnRequestVO> getApplyOrders(ApplyReturnRequestSearchQO request, Page<Object> objectPage);
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
@ -1,5 +1,6 @@
 package com.nflg.wms.repository.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.qo.ApplyReturnRequestSearchQO;
@ -26,9 +27,9 @@ public interface IWmsReturnRequestService extends IService<WmsReturnRequest> {

    void addPurchaseReturns(List<WmsReturnRequest> returnRequests, List<WmsReturnRequestItem> returnRequestItems);

-    ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid GoodsReceiptSearchQO request);
+    IPage<GoodsReceiptVO> getGoodsReceipts(@Valid GoodsReceiptSearchQO request);

    void delApplyOrders(@NotNull Long id);

-    ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid ApplyReturnRequestSearchQO request);
+    IPage<ApplyReturnRequestVO> getApplyOrders(@Valid ApplyReturnRequestSearchQO request);
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
@ -49,7 +50,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
    }

    @Override
-    public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(GoodsReceiptSearchQO request) {
+    public IPage<GoodsReceiptVO> getGoodsReceipts(GoodsReceiptSearchQO request) {
        return baseMapper.getGoodsReceipts(request, new Page<>(request.getPage(), request.getPageSize()));
    }

@ -63,7 +64,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
    }

    @Override
-    public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(ApplyReturnRequestSearchQO request) {
+    public IPage<ApplyReturnRequestVO> getApplyOrders(ApplyReturnRequestSearchQO request) {
        return baseMapper.getApplyOrders(request, new Page<>(request.getPage(), request.getPageSize()));
    }
 }
--- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nflg.wms.repository.mapper.WmsReturnRequestMapper">

-    <select id="getGoodsReceipts" resultType="com.nflg.wms.common.pojo.PageData">
+    <select id="getGoodsReceipts" resultType="com.nflg.wms.common.pojo.vo.GoodsReceiptVO">
        select a.note_num as delivery_no,a.line_number as delivery_line_no,a.po_num,a.po_line_number,a.item_code as
        material_code,a.item_name as material_description,sum(a.in_qty) as request_quantity,
        a.uom_code,a.received_warehouse as storage_location,a.iu_code as factory_code,a.purchase_group,a.supplier_num as
@ -40,33 +40,34 @@
        a.note_num,a.line_number,a.po_num,a.po_line_number,a.item_code,a.item_name,a.uom_code,a.received_warehouse,a.iu_code,a.purchase_group,a.supplier_num,b.supplier_name,a.received_warehouse
    </select>

-    <select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.PageData">
-        SELECT * from wms_return_request
-        <where>
-            <if test="request.applicationNo !=null and request.applicationNo !=''">
-                and a.application_no =#{request.applicationNo}
-            </if>
-            <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and a.supplier_code =#{ request.supplierCode}
-            </if>
-            <if test="request.poNum !=null and request.poNum !=''">
-                and a.po_num =#{ request.poNum}
-            </if>
-            <if test="request.approvalStatus !=null and request.approvalStatus !=''">
-                and a.approval_status =#{ request.approvalStatus}
-            </if>
-            <if test="request.documentType !=null and request.documentType !=''">
-                and a.document_type =#{ request.documentType}
-            </if>
-            <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
-                and a.purchase_group =#{ request.purchaseGroup}
-            </if>
-            <if test="request.startDate !=null">
-                and a.approve_time>= #{request.inStartDate}
-            </if>
-            <if test="request.endDate !=null">
-                and a.approve_time &lt;= #{request.inEndDate}
-            </if>
-        </where>
-    </select>
+        <select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.vo.ApplyReturnRequestVO">
+            SELECT * from wms_return_request
+            <where>
+                <if test="request.applicationNo !=null and request.applicationNo !=''">
+                    and a.application_no =#{request.applicationNo}
+                </if>
+                <if test="request.supplierCode !=null and request.supplierCode !=''">
+                    and a.supplier_code =#{ request.supplierCode}
+                </if>
+                <if test="request.poNum !=null and request.poNum !=''">
+                    and a.po_num =#{ request.poNum}
+                </if>
+                <if test="request.approvalStatus !=null and request.approvalStatus !=''">
+                    and a.approval_status =#{ request.approvalStatus}
+                </if>
+                <if test="request.documentType !=null and request.documentType !=''">
+                    and a.document_type =#{ request.documentType}
+                </if>
+                <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
+                    and a.purchase_group =#{ request.purchaseGroup}
+                </if>
+                <if test="request.startDate !=null">
+                    and a.approve_time>= #{request.inStartDate}
+                </if>
+                <if test="request.endDate !=null">
+                    and a.approve_time &lt;= #{request.inEndDate}
+                </if>
+            </where>
+        </select>
+
 </mapper>
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java
@ -203,16 +203,16 @@ public class DeliveryController extends BaseController {
        WmsShipmentDelivery delivery = deliveryService.getById(id);
        VUtil.trueThrowBusinessError(Objects.isNull(delivery)).throwMessage("清单不存在");
        AtomicInteger index = new AtomicInteger(1);
-//        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.lambdaQuery()
-//                .eq(WmsShipmentDeliveryItem::getDeliveryId, id)
-//                .orderByAsc(WmsShipmentDeliveryItem::getId)
-//                .list()
-//                .stream().map(item -> {
-//                    ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item);
-//                    vo.setIndex(index.getAndIncrement());
-//                    return vo;
-//                }).toList();
-        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.getItemsVO(id);
+        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.lambdaQuery()
+                .eq(WmsShipmentDeliveryItem::getDeliveryId, id)
+                .orderByAsc(WmsShipmentDeliveryItem::getId)
+                .list()
+                .stream().map(item -> {
+                    ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item);
+                    vo.setIndex(index.getAndIncrement());
+                    return vo;
+                }).toList();
+//        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.getItemsVO(id);
        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("发货清单-" + delivery.getNo() + ".xlsx", StandardCharsets.UTF_8));
        new Workbook()
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java
@ -125,6 +125,19 @@ public class MaterialController extends BaseController {
        );
    }

+    /**
+     * 同步-查询
+     * @param materialNos 图纸编号列表
+     */
+    @PostMapping("syncSearch")
+    public ApiResult<List<WmsShipmentMaterial>> syncSearch(@RequestBody @NotEmpty List<String> materialNos) {
+        return ApiResult.success(
+                shipmentMaterialService.lambdaQuery()
+                        .in(WmsShipmentMaterial::getNo, materialNos)
+                        .list()
+        );
+    }
+
    /**
     * 同步-保存
     */
--- a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx
+++ b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx
Author	SHA1	Message	Date
zhangke	86517ae775	修改分页插叙的方法	2026-03-03 10:59:05 +08:00
zhangke	aca556b024	Merge branch 'develop' into dev_zhangke	2026-03-03 10:57:20 +08:00
曹鹏飞	14b63082c1	feat(material): 添加同步查询功能 - 实现了 syncSearch 接口用于根据图纸编号列表查询材料信息 - 添加了接口文档注释说明参数和功能 - 使用 LambdaQuery 查询数据库中的材料记录 - 返回成功响应并封装为 ApiResult 格式	2026-02-28 14:59:29 +08:00
曹鹏飞	2c323af7ed	根据新模板调整配件销售发货清单导出的PDF样式	2026-02-28 14:42:51 +08:00
曹鹏飞	2ecdb7a9b7	refactor(delivery): 优化发货清单物料代码项查询逻辑 - 移除注释中的旧查询方法调用 - 恢复并实现完整的Lambda查询链式调用 - 保持索引递增和数据转换功能不变 - 维持Excel文件下载功能的正常运行	2026-02-28 09:42:59 +08:00
曹鹏飞	77882f07a1	Merge remote-tracking branch '惠信/develop' into develop	2026-02-28 09:38:42 +08:00
曹鹏飞	e751dae69f	fix: bug-1343 单据管理-成品发货单，打印显示异常	2026-02-28 09:33:11 +08:00