diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryMapper.java
index 6774c01d..16965373 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentDeliveryMapper.java
@@ -19,4 +19,6 @@ public interface WmsShipmentDeliveryMapper extends BaseMapper<WmsShipmentDeliver
     WmsShipmentDelivery getByPackagingCodeId(Long id);
 
     List<ShipmentPackagingCodeVO> getBoxByPlateNumber(String plateNumber);
+
+    List<ShipmentPackagingCodeVO> getBoxByDeliveryId(Long deliveryId);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryService.java
index c53c634f..af8293c5 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentDeliveryService.java
@@ -20,4 +20,6 @@ public interface IWmsShipmentDeliveryService extends IService<WmsShipmentDeliver
     WmsShipmentDelivery getByPackagingCodeId(Long id);
 
     List<ShipmentPackagingCodeVO> getBoxByPlateNumber(String plateNumber);
+
+    List<ShipmentPackagingCodeVO> getBoxByDeliveryId(Long deliveryId);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryServiceImpl.java
index 738185d4..3cc68906 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentDeliveryServiceImpl.java
@@ -29,4 +29,9 @@ public class WmsShipmentDeliveryServiceImpl extends ServiceImpl<WmsShipmentDeliv
     public List<ShipmentPackagingCodeVO> getBoxByPlateNumber(String plateNumber) {
         return baseMapper.getBoxByPlateNumber(plateNumber);
     }
+
+    @Override
+    public List<ShipmentPackagingCodeVO> getBoxByDeliveryId(Long deliveryId) {
+        return baseMapper.getBoxByDeliveryId(deliveryId);
+    }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryMapper.xml
index ec9d5d1d..7c46f765 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentDeliveryMapper.xml
@@ -17,4 +17,13 @@
         INNER JOIN wms_shipment_delivery sd ON sdi.delivery_id=sd."id"
         WHERE sd.plate_number=#{plateNumber}
     </select>
+
+    <select id="getBoxByDeliveryId" resultType="com.nflg.wms.common.pojo.vo.ShipmentPackagingCodeVO">
+        SELECT c.*,di."name" AS "type_name"
+        FROM wms_shipment_packaging_code c
+        LEFT JOIN dictionary_item di ON c."type"=di."id"
+        INNER JOIN wms_shipment_delivery_item sdi ON sdi.packaging_code_id=c."id"
+        INNER JOIN wms_shipment_delivery sd ON sdi.delivery_id=sd."id"
+        WHERE sd.id=#{deliveryId}
+    </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 99a4b699..48a947c4 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
@@ -286,6 +286,14 @@ public class DeliveryController extends BaseController {
         );
     }
 
+    /**
+     * 根据发货单查询已装车的箱子（PDA使用）
+     */
+    @GetMapping("getBoxByDeliveryId")
+    public ApiResult<List<ShipmentPackagingCodeVO>> getBoxByDeliveryId(@RequestParam Long deliveryId) {
+        return ApiResult.success(deliveryService.getBoxByDeliveryId(deliveryId));
+    }
+
     /**
      * 装车（PDA使用）
      */