diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index c79b3adf4..67631bb95 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -496,10 +496,22 @@ public class EmisSettleBillController extends BaseController
                 voMap.put("billCode",billItem.getBillCode());
                 voMap.put("fjr",billItem.getWaybillDetail().getSendName()+"--"+billItem.getWaybillDetail().getReceiveName());
                 voMap.put("kjlx",billItem.getWaybillDetail().getSendSiteName()+"--"+billItem.getWaybillDetail().getDispatchUnderlingSiteName());
-                voMap.put("company",billItem.getWaybillDetail().getCustName());
+
+                String company=billItem.getWaybillDetail().getCustName();
+                if(
+                        "1".equals(billItem.getWaybillDetail().getPaymentType()) ||
+                        "3".equals(billItem.getWaybillDetail().getPaymentType()) ||
+                        "5".equals(billItem.getWaybillDetail().getPaymentType())
+
+                ){
+                    company=billItem.getWaybillDetail().getSendCompany();
+                }
+
+                voMap.put("company",company);
                 voMap.put("paymentType", DictUtils.getDictLabel("emis_payment_type",billItem.getWaybillDetail().getPaymentType()));
                 voMap.put("productTypeName", billItem.getWaybillDetail().getProductTypeName());
                 voMap.put("parcelQty", billItem.getWaybillDetail().getParcelQty().toString());
+                voMap.put("billWeight", billItem.getWaybillDetail().getBillWeight().stripTrailingZeros().toPlainString());
                 voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight().stripTrailingZeros().toPlainString());
                 voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().stripTrailingZeros().toPlainString());
                 voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
diff --git a/emis-biz/src/main/resources/tpl/bill_tpl.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl.xlsx
index cd8dc1209..e561b3d72 100644
Binary files a/emis-biz/src/main/resources/tpl/bill_tpl.xlsx and b/emis-biz/src/main/resources/tpl/bill_tpl.xlsx differ
diff --git a/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx
index 33c3a3ea8..b612f5402 100644
Binary files a/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx and b/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx differ