diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index c05a30a84..bb27c759f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -126,7 +126,6 @@ public class EmisCommonController extends EmisBaseController
         return AjaxResult.success("获取成功",emisElectronicPagService.getCenterTotalAvailablePag("T7080"));
     }
 
-
     /**
      * 获取网点总可用面单数
      */
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
index c24993875..cbd6998e2 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
@@ -69,6 +69,25 @@ public class EmisMonthpayAccountController extends EmisBaseController
         return getDataTable(list);
     }
 
+    /**
+     * 所有月结客户，包含停用的客户
+     * @param emisCustomerUser
+     * @return
+     */
+    @JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listAllSimple")
+    public TableDataInfo listAllSimple(EmisCustomerUser emisCustomerUser)
+    {
+        startPage();
+        if(!(getLoginUser().getUser().isTopSite())){
+            emisCustomerUser.setBizSite(getLoginUser().getUser().getOwnerSiteCode());
+        }
+        emisCustomerUser.setCustomerType("2");
+        List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
+        return getDataTable(list);
+
+    }
+
     /**
      * 获取月结卡信息 注意，该接口单独重新包装，使用月结用户信息
      * @param emisCustomerUser
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillDeclareGoods.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillDeclareGoods.java
index 00e4d5732..45bb7efce 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillDeclareGoods.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillDeclareGoods.java
@@ -96,4 +96,7 @@ public class EmisWaybillDeclareGoods extends BaseEntity
     /* 排序 */
     private Integer orderNum;
 
+    // 扩展字段
+    /* 货值=单价x数量 */
+    private BigDecimal totalPrice;
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index d86ad5fce..79ab4d03b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -4184,7 +4184,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             tplName="tpl/ws_ls_in_tpl.docx";
         }
 
-        BigDecimal totalPrice=BigDecimal.ZERO;
+        BigDecimal totalAllPrice=BigDecimal.ZERO;
         try {
             OutputStream outputStream = response.getOutputStream();
             InputStream fis = new ClassPathResource(tplName).getInputStream();
@@ -4208,12 +4208,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
                         if(itemGoods.getCargoQty()!=null) {
                             itemGoods.setCargoQty(new BigDecimal(itemGoods.getCargoQty().stripTrailingZeros().toPlainString()));
+                        }else{
+                            itemGoods.setCargoQty(new BigDecimal(1));
                         }
 
                         if(itemGoods.getPrice()!=null) {
                             itemGoods.setPrice(new BigDecimal(itemGoods.getPrice().stripTrailingZeros().toPlainString()));
-                            totalPrice = totalPrice.add(itemGoods.getPrice());
+                            BigDecimal totalPrice = itemGoods.getPrice().multiply(itemGoods.getCargoQty());
+                            itemGoods.setTotalPrice(totalPrice);
+
+                            totalAllPrice=totalAllPrice.add(totalPrice);
                         }
+
                     }
                 }
                 else{
@@ -4314,7 +4320,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             fillMap.put("cargoList", declareGoodsList);
 
-            fillMap.put("totalPrice", totalPrice.stripTrailingZeros().toPlainString());
+            fillMap.put("totalAllPrice", totalAllPrice.stripTrailingZeros().toPlainString());
 
             // 生成模版
             XWPFTemplate template = XWPFTemplate.compile(fis, config).render(fillMap);
@@ -4400,7 +4406,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             tplName="tpl/ws_ls_in_tpl.docx";
         }
 
-        BigDecimal totalPrice=BigDecimal.ZERO;
+        BigDecimal totalAllPrice=BigDecimal.ZERO;
         try {
             OutputStream outputStream = response.getOutputStream();
             InputStream fis = new ClassPathResource(tplName).getInputStream();
@@ -4426,11 +4432,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
                         if(itemGoods.getCargoQty()!=null) {
                             itemGoods.setCargoQty(new BigDecimal(itemGoods.getCargoQty().stripTrailingZeros().toPlainString()));
+                        }else{
+                            itemGoods.setCargoQty(new BigDecimal(1));
                         }
 
                         if(itemGoods.getPrice()!=null) {
                             itemGoods.setPrice(new BigDecimal(itemGoods.getPrice().stripTrailingZeros().toPlainString()));
-                            totalPrice = totalPrice.add(itemGoods.getPrice());
+                            BigDecimal totalPrice = itemGoods.getPrice().multiply(itemGoods.getCargoQty());
+                            itemGoods.setTotalPrice(totalPrice);
+
+                            totalAllPrice=totalAllPrice.add(totalPrice);
                         }
                     }
                 }
@@ -4530,7 +4541,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             fillMap.put("cargoList", declareGoodsList);
 
-            fillMap.put("totalPrice", totalPrice.stripTrailingZeros().toPlainString());
+            fillMap.put("totalAllPrice", totalAllPrice.stripTrailingZeros().toPlainString());
 
             // 生成模版
             XWPFTemplate template = XWPFTemplate.compile(fis, config).render(fillMap);
diff --git a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx
index b1f0509d3..c68c9641a 100644
Binary files a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx differ
diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx
index 9450ef732..16c7db447 100644
Binary files a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx differ