diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
index 1b0ed74a..ac04d90a 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
@@ -2112,6 +2112,9 @@ public class CoDelServiceImpl implements CoDelService {
     @Override
     @Transactional
     public void saveOneClickPacking(EcssCoDelPalletHeaderData inData) {
+        if (inData.getHeight()==null) {
+            throw new RuntimeException("栈板高度(M)不可为空！");
+        }
         // 发货通知单
         EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(inData.getSite(), inData.getDelNo());
         // 先删除已存在的装箱数据
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 09404f26..83d9e884 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -530,7 +530,7 @@ create_by,create_date,update_by,update_date
             and seq_no=#{seqNo}
         </if>
         <if test="itemNo != null and itemNo != ''">
-            and itemNo=#{itemNo}
+            and item_no=#{itemNo}
         </if>
     </delete>
 
diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
index 66c68658..9bceb1f3 100644
--- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml
+++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
@@ -86,7 +86,7 @@
 	</select>
 
 	<select id="getCustomerList"  resultType="java.util.Map">
-		select ccusname from view_custdev_mes_cmc_customer
+		select * from view_custdev_mes_cmc_customer
 		<where>
 			<if test="ccusname != null and ccusname != ''">
 				and ccusname  like '%'+#{ccusname}+'%'
diff --git a/src/main/resources/templates/declaration-all-seal-template.xlsx b/src/main/resources/templates/declaration-all-seal-template.xlsx
index 5c2ae909..93e22c16 100644
Binary files a/src/main/resources/templates/declaration-all-seal-template.xlsx and b/src/main/resources/templates/declaration-all-seal-template.xlsx differ
diff --git a/src/main/resources/templates/declaration-all-template.xlsx b/src/main/resources/templates/declaration-all-template.xlsx
index 02bfcbd4..079d8fbc 100644
Binary files a/src/main/resources/templates/declaration-all-template.xlsx and b/src/main/resources/templates/declaration-all-template.xlsx differ
diff --git a/src/main/resources/templates/declaration-all2-template.xlsx b/src/main/resources/templates/declaration-all2-template.xlsx
index a0376c67..fea1ff7a 100644
Binary files a/src/main/resources/templates/declaration-all2-template.xlsx and b/src/main/resources/templates/declaration-all2-template.xlsx differ
diff --git a/src/main/resources/templates/declaration-invoice-seal-template.xlsx b/src/main/resources/templates/declaration-invoice-seal-template.xlsx
index c41f48c4..5fa41ed0 100644
Binary files a/src/main/resources/templates/declaration-invoice-seal-template.xlsx and b/src/main/resources/templates/declaration-invoice-seal-template.xlsx differ
diff --git a/src/main/resources/templates/declaration-invoice-template.xlsx b/src/main/resources/templates/declaration-invoice-template.xlsx
index 20031352..d81304ef 100644
Binary files a/src/main/resources/templates/declaration-invoice-template.xlsx and b/src/main/resources/templates/declaration-invoice-template.xlsx differ
diff --git a/src/main/resources/templates/declaration-invoice2-template.xlsx b/src/main/resources/templates/declaration-invoice2-template.xlsx
index f74b692e..300956c2 100644
Binary files a/src/main/resources/templates/declaration-invoice2-template.xlsx and b/src/main/resources/templates/declaration-invoice2-template.xlsx differ