diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 0581627f1..4db597d1e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -695,6 +695,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             String Description = param.getString("Description"); // 来源卷位置
             String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置
             String box_type = param.getString("Attribute1"); // 木箱料号
+            String box_length = param.getString("Attribute2"); // 木箱料号
+            String box_width = param.getString("Attribute3"); // 木箱料号
+            String box_high = param.getString("Attribute4"); // 木箱料号
 
             JSONArray details = param.getJSONArray("details");
 
@@ -723,6 +726,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 jo.put("package_box_sn", PackageBoxSN);
                 jo.put("sap_pcsn", sap_pcsn);
                 jo.put("box_type", box_type);
+                jo.put("box_length", box_length);
+                jo.put("box_width", box_width);
+                jo.put("box_high", box_high);
                 jo.put("quanlity_in_box", QuanlityInBox);
                 jo.put("box_weight", BoxWeight);
                 jo.put("quality_guaran_period", QualityGuaranPeriod);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index 6f3c83113..3334b86fd 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 93886f66f..118b8bbdc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2149,7 +2149,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 //        WriteSheet sheet = EasyExcel.writerSheet().build();
         // 5.单组填充
         HashMap<String, Object> oneMap = new HashMap<>();
-        oneMap.put("vbeln", "");
         oneMap.put("consignee", jsonMst.getString("consignee"));
         oneMap.put("receiver", jsonMst.getString("receiver"));
         oneMap.put("receiptaddress", jsonMst.getString("receiptaddress"));
@@ -2159,7 +2158,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         oneMap.put("carno", jsonMst.getString("carno"));
         oneMap.put("driverphone", jsonMst.getString("driverphone"));
         oneMap.put("contractno", jsonMst.getString("contractno"));
-        oneMap.put("all_box", "");
+        // 总箱数
+        JSONArray jsonAllBox = WQL.getWO("ST_OUTIVT02").addParam("flag", "4").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0);
+        oneMap.put("all_box", jsonAllBox.size());
         oneMap.put("all_qty", "");
         oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress"));
         oneMap.put("deliveryname", jsonMst.getString("deliveryname"));
@@ -2176,6 +2177,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 JSONObject json = dtlArr.getJSONObject(i);
                 HashMap<String, Object> mapFL = new HashMap<>();
 
+                oneMap.put("vbeln", json.getString("vbeln")); // 送货单号
+                // 明细
                 mapFL.put("index", i + 1);
                 mapFL.put("source_bill_code", json.getString("source_bill_code"));
                 mapFL.put("material_name", json.getString("material_name"));
@@ -2199,6 +2202,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 }
                 JSONObject json = dtlArr.getJSONObject(i);
                 HashMap<String, Object> mapFL = new HashMap<>();
+
+                oneMap.put("vbeln", json.getString("vbeln")); // 送货单号
+                // 明细
                 mapFL.put("index", i + 1);
                 mapFL.put("source_bill_code", json.getString("source_bill_code"));
                 mapFL.put("material_name", json.getString("material_name"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql
index 61ae56fae..fe82afebc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql
@@ -98,6 +98,25 @@
                         dtl.iostorinv_id = 输入.iostorinv_id
                 ENDOPTION
 
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+    IF 输入.flag = "3"
+		QUERY
+            SELECT
+                count(*) AS num
+            FROM
+                ST_IVT_IOStorInvDis dis
+            WHERE
+                1 = 1
+
+                OPTION 输入.iostorinv_id <> ""
+                        dis.iostorinv_id = 输入.iostorinv_id
+                ENDOPTION
+
+                group by dis.struct_id
+
 			ENDSELECT
 		ENDQUERY
 	ENDIF
\ No newline at end of file