diff --git 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
index 36e93012..260aa8c2 100644
--- 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
@@ -19,6 +19,7 @@ import com.nflg.wms.shipment.pojo.dto.DeliveryExportDTO;
 import com.nflg.wms.shipment.pojo.qo.DeliverySearchFromCRMQO;
 import com.nflg.wms.shipment.service.BasdeSerialNumberControllerService;
 import com.nflg.wms.shipment.service.CRMService;
+import com.nflg.wms.shipment.util.QRCodeUtil;
 import com.nflg.wms.starter.BaseController;
 import com.nflg.wms.starter.service.BomMaterialService;
 import jakarta.annotation.Resource;
@@ -39,9 +40,7 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -199,7 +198,7 @@ public class DeliveryController extends BaseController {
      * 根据发货单导出子项
      */
     @GetMapping("exportItemToExcel")
-    public void exportItemToExcel(HttpServletResponse response, @RequestParam Long id) throws IOException {
+    public void exportItemToExcel(HttpServletResponse response, @RequestParam Long id) throws Exception {
         WmsShipmentDelivery delivery = deliveryService.getById(id);
         VUtil.trueThrowBusinessError(Objects.isNull(delivery)).throwMessage("清单不存在");
 //        AtomicInteger index = new AtomicInteger(1);
@@ -215,10 +214,13 @@ public class DeliveryController extends BaseController {
         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));
+        Map<String, Object> ext = new HashMap<>();
+        ext.put("pic", QRCodeUtil.generateQRCode(delivery.getNo(), 200, 200));
         new Workbook()
                 .addSheet(new TemplateSheet(new ClassPathResource("template/发货清单模版.xlsx").getInputStream())
                         .setData("info", delivery)
                         .setData("list", list)
+                        .setData("ext", ext)
                 ).writeTo(response.getOutputStream());
     }
 
@@ -337,7 +339,7 @@ public class DeliveryController extends BaseController {
     }
 
     /**
-     * 根据车牌号查询已装车的箱子（PDA使用）
+     * 根据车牌号/发货单号查询已装车的箱子（PDA使用）
      */
     @GetMapping("getBoxByPlateNumber")
     public ApiResult<List<ShipmentPackagingCodeVO>> getBoxByPlateNumber(@RequestParam String plateNumber) {
@@ -363,7 +365,7 @@ public class DeliveryController extends BaseController {
                 .update();
         if (!deliveryItemService.lambdaQuery()
                 .eq(WmsShipmentDeliveryItem::getDeliveryId, delivery.getId())
-                .exists()){
+                .exists()) {
             deliveryService.lambdaUpdate()
                     .set(WmsShipmentDelivery::getBoxStatus, 0)
                     .set(WmsShipmentDelivery::getUpdateBy, UserUtil.getUserName())
diff --git a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx
index 2c7a8160..01e4dbd2 100644
Binary files a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx and b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx differ