diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryItemMapper.java
index bbdb0e54..61b0df5c 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryItemMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryItemMapper.java
@@ -1,8 +1,11 @@
 package com.nflg.wms.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
 import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,5 @@ import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem;
  */
 public interface WmsShipmentDeliveryItemMapper extends BaseMapper<WmsShipmentDeliveryItem> {
 
+    List<ShipmentMaterialCodeItemVO> getItemsVO(Long id);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryItemService.java
index be8bdd94..920c9f61 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryItemService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryItemService.java
@@ -1,8 +1,11 @@
 package com.nflg.wms.repository.service;
 
+import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
 import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IWmsShipmentDeliveryItemService extends IService<WmsShipmentDeliveryItem> {
 
+    List<ShipmentMaterialCodeItemVO> getItemsVO(Long id);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryItemServiceImpl.java
index 49e03ca7..65cbd083 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryItemServiceImpl.java
@@ -1,11 +1,14 @@
 package com.nflg.wms.repository.service.impl;
 
+import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
 import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem;
 import com.nflg.wms.repository.mapper.WmsShipmentDeliveryItemMapper;
 import com.nflg.wms.repository.service.IWmsShipmentDeliveryItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class WmsShipmentDeliveryItemServiceImpl extends ServiceImpl<WmsShipmentDeliveryItemMapper, WmsShipmentDeliveryItem> implements IWmsShipmentDeliveryItemService {
 
+    @Override
+    public List<ShipmentMaterialCodeItemVO> getItemsVO(Long id) {
+        return baseMapper.getItemsVO(id);
+    }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryItemMapper.xml
index a14c6d77..cce2a70f 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryItemMapper.xml
@@ -2,4 +2,13 @@
 <!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.WmsShipmentDeliveryItemMapper">
 
+    <select id="getItemsVO" resultType="com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO">
+        SELECT ROW_NUMBER() OVER (ORDER BY smdiq.item_id DESC) as "index",smdi.material_no,smdi.material_describe,SUM(smdi.num) as num,SUM(smdiq.num) as actualNum,smdi.unit
+        FROM wms_shipment_delivery_item sdi
+        INNER JOIN wms_shipment_packaging_code_item spci ON sdi.packaging_code_id=spci.packaging_code_id
+        INNER JOIN wms_shipment_material_code_item_qr smdiq ON smdiq.id=spci.material_code_item_qr_id
+        INNER JOIN wms_shipment_material_code_item smdi ON smdiq.item_id=smdi."id"
+        WHERE sdi.delivery_id = #{id}
+        GROUP BY smdiq.item_id,smdi.material_no,smdi.material_describe,smdi.unit
+    </select>
 </mapper>
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 48a947c4..f96dfe26 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
@@ -203,15 +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.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()
diff --git a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx
index b646b745..e7181346 100644
Binary files a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx and b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx differ