diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
index d2519cde..b787d2c2 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
@@ -318,10 +318,12 @@ public class StructuralPackageOrderController extends BaseController {
         request.getItems().forEach(orderQO -> {
             WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO);
             order.setOrderNo(orderNo);
+            
             if (Objects.isNull(order.getId())) {
                 order.setId(IdUtil.getSnowflakeNextId());
                 order.setCreateBy(UserUtil.getUserName());
                 order.setCreateTime(LocalDateTime.now());
+                order.setState(OrderState.Unpackaged.getState()); // 初始化订单状态为未打包
                 ordersForAdd.add(order);
             } else {
                 order.setUpdateBy(UserUtil.getUserName());
@@ -562,6 +564,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setSupplierName(trayVO.getSupplierName())
                 .setModelNos(trayVO.getModelNo())
                 .setVersion(trayVO.getPackageVersion())
+                .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
                 .setWeight(trayVO.getWeight())
@@ -1069,8 +1072,13 @@ public class StructuralPackageOrderController extends BaseController {
         info.put("today", DateTimeUtil.format(LocalDate.now()));
         List<DeliverStructuralPackageOrderForPackageItemVO> datas = structuralPackageOrderService.getInfoByDeliverOrderNo(deliverOrder.getNo());
         datas.forEach(it -> {
+            // 只统计已打包的托盘数量（状态为1：已打包、2：在途、3：已收货）
             it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery()
                     .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId())
+                    .in(WmsStructuralPackageOrderTray::getState, 
+                        OrderState.Packaged.getState(), 
+                        OrderState.InTransit.getState(), 
+                        OrderState.Received.getState())
                     .count()));
         });
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
@@ -1813,7 +1821,13 @@ public class StructuralPackageOrderController extends BaseController {
         // 10. 保存二维码扫描记录
         saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1);
 
-        // 11. 构建返回结果
+        // 11. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包）
+        structuralPackageOrderService.lambdaUpdate()
+                .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState())
+                .eq(WmsStructuralPackageOrder::getId, orderId)
+                .update();
+
+        // 12. 构建返回结果
         PackTraySubmitResultVO result = new PackTraySubmitResultVO();
         result.setHasDiff(false);
         result.setDiffList(new ArrayList<>());
@@ -1976,7 +1990,13 @@ public class StructuralPackageOrderController extends BaseController {
         // 8. 保存二维码扫描记录
         saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1);
 
-        // 9. 构建返回结果
+        // 9. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包）
+        structuralPackageOrderService.lambdaUpdate()
+                .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState())
+                .eq(WmsStructuralPackageOrder::getId, orderId)
+                .update();
+
+        // 10. 构建返回结果
         PackTraySubmitWithDiffVO result = new PackTraySubmitWithDiffVO();
         result.setOrderId(request.getOrderId());
 
@@ -2104,6 +2124,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setSupplierName(trayVO.getSupplierName())
                 .setModelNos(trayVO.getModelNo())
                 .setVersion(trayVO.getPackageVersion())
+                .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
                 .setWeight(trayVO.getWeight())
diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
index 13c85556..86e13dd4 100644
--- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
+++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
@@ -108,8 +108,7 @@
         <tr>
             <td style="width: 120px;height: 35px;">订单号：<span th:text="${info.externalOrderNo}">7500381665</span></td>
             <td style="width: 80px;">行号：<span th:text="${info.rowNo}">10</span></td>
-            <!-- 托盘号已移除，保留空单元格 -->
-            <td style="width: 120px;"></td>
+            <td style="width: 120px;">ECO：<span th:text="${info.eco}"></span></td>
             <td colspan="2">供应商：<span th:text="${info.supplierName}">首钢凯西钢铁有限公司</span></td>
             <td rowspan="3" class="cell-img" style="width: 110px;">
                 <img alt="" style="width: 100px;" th:src="${info.qrCode}" src="../img/logo1.png"/>
diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx
index 1a3b2c32..2b1f7508 100644
Binary files a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx and b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx differ
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java
index 3117bfd3..e79be61b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java
@@ -39,7 +39,7 @@ public class PackageAddQO {
     /**
      * 机型编号
      */
-    @NotEmpty
+//    @NotEmpty
     private List<Long> modelIds;
 
     /**
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java
index 71cfa890..310f9b62 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java
@@ -79,6 +79,16 @@ public class PackageDeliverOrderSaveItemQO {
      */
     private String kzkri;
 
+    /**
+     * 版本号（从钢构件基础信息获取）
+     */
+    private String version;
+
+    /**
+     * ECO（从钢构件基础信息获取）
+     */
+    private String eco;
+
     @JsonIgnore
     private String key1;
 
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java
index 8b7cbe11..b6691392 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java
@@ -92,4 +92,14 @@ public class DeliverStructuralPackageOrderForPackageItemVO {
      * 该订单下包含的托盘号
      */
     private List<String> trayNos;
+
+    /**
+     * 版本号（从钢构件基础信息获取）
+     */
+    private String version;
+
+    /**
+     * ECO（从钢构件基础信息获取）
+     */
+    private String eco;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
index 9410388f..b1453dcd 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
@@ -169,4 +169,21 @@ public class DeliverStructuralPackageOrderVO {
      * 工厂编号
      */
     private String factoryNo;
+
+    /**
+     * 版本号（从钢构件基础信息获取）
+     */
+    @ExcelColumn(value = "版本", colIndex = 12)
+    private String version;
+
+    /**
+     * ECO（从钢构件基础信息获取）
+     */
+    @ExcelColumn(value = "ECO", colIndex = 13)
+    private String eco;
+
+//    /**
+//     * 状态，0：未打包；1：已打包；2-在途；3-已收货
+//     */
+//    private Short state;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
index 55b6d2f8..dfd052f5 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
@@ -121,4 +121,19 @@ public class WmsStructuralPackageOrder implements Serializable {
      * 是否存在缺货零件
      */
     private Boolean quehuo;
+
+    /**
+     * 版本号（从钢构件基础信息获取）
+     */
+    private String version;
+
+    /**
+     * ECO（从钢构件基础信息获取）
+     */
+    private String eco;
+
+    /**
+     * 状态，0：未打包；1：已打包；2-在途；3-已收货
+     */
+    private Short state;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
index e53167a3..516845aa 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
@@ -5,6 +5,7 @@
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
         ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo",o.quehuo
+        ,o.version,o.eco
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -38,7 +39,7 @@
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
-                  ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
+                  ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",o.version,o.eco
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -51,6 +52,7 @@
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
              ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",di.code AS "factory_no"
+             ,o.version,o.eco
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -64,7 +66,7 @@
     <select id="getInfoByDeliverOrderNo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO">
         SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp."no" AS "package_no"
                   ,sp."name" AS "package_desc",sp.drawing_no as "package_drawing_no",sp.remark as "package_remark",o.num
-            ,wh.no as "warehouse_no"
+            ,wh.no as "warehouse_no",o.version,o.eco
         FROM wms_structural_package_deliver_order pdo
         inner join wms_structural_package_deliver_order_map pdom on pdo.id=pdom.deliver_id
         LEFT JOIN wms_structural_package_order o on o.id=pdom.order_id
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
index 930afaea..c20a26de 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
@@ -6,6 +6,7 @@
         SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",o.*,m.no||wb."no" AS "workbench_code"
         ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no"
         ,sp."name" AS "package_desc",(SELECT COUNT(*) FROM wms_structural_package_order_tray ot WHERE ot.order_id=o.id) AS "trayNum",m."no" AS "model_no",'' as "tray_no",null as "tray",spdom.deliver_id
+        ,o.version,o.eco
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -14,7 +15,7 @@
         left join wms_structural_package_deliver_order_map spdom on o.id=spdom.order_id
         where 1=1
         <if test="request.state!=null">
-            and exists (select 1 from wms_structural_package_order_tray ot where ot.order_id=o.id and ot.state=#{request.state})
+            and o.state=#{request.state}
         </if>
         <if test="request.orderNo!=null and request.orderNo!=''">
             and o.order_no=#{request.orderNo}
@@ -47,7 +48,7 @@
         SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.order_id,o.*,m.no||wb."no" AS "workbench_code"
         ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no"
         ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,ot.id as "tray_id"
-        ,o.quehuo
+        ,o.quehuo,o.version,o.eco
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -65,6 +66,7 @@
         SELECT ot.id,ot.weight,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
             ,sp.cate as "package_cate",sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.order_id
             ,ot.no as "tray_no",ot.tray,ot.station,ot.state,sp.version as "package_version",sp.drawing_no as "package_drawing_no"
+            ,o.version,o.eco
         FROM wms_structural_package_order o
                  LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
                  LEFT JOIN user_supplier us ON o.supplier_id=us.id