From 7928d8fddbfd31fd2dbbfe59f676e25ea11fefad Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 1 Jul 2025 17:35:05 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisTransLineController.java | 25 ++++++++++++++++++-
 .../EmisSettleInvoiceChRecordServiceImpl.java | 11 +++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
index 303ac5fb9..798f20bc9 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
@@ -72,7 +72,7 @@ public class EmisTransLineController extends EmisBaseController
      * 查询线路列表 -- 精简
      */
 //    @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')")
-    @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType","status"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimple")
     public TableDataInfo listSimple(EmisTransLine emisTransLine)
     {
@@ -86,6 +86,29 @@ public class EmisTransLineController extends EmisBaseController
 
 
 
+        startPage();
+        List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);
+        return getDataTable(list);
+    }
+
+    /**
+     * 全部线路-包含停用
+     * @param emisTransLine
+     * @return
+     */
+    @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType","status"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listSimpleAll")
+    public TableDataInfo listSimpleAll(EmisTransLine emisTransLine)
+    {
+        // 总部不限制
+        if(!(getLoginUser().getUser().isTopSite())){
+            EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode());
+            emisTransLine.setLogoType(site.getLogoType());
+            emisTransLine.getParams().put("needFilterLogoTyoe","1");
+        }
+
+
+
         startPage();
         List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);
         return getDataTable(list);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
index 2930151bd..83a097a3f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
@@ -470,7 +470,16 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
 
 
         order.setDetailInfos(goodsList);
-        JSONObject jRst =HXSdk.asyncOpenBillReceive(order,emisBaseInvoiceChInfo.getToken());
+
+        JSONObject jRst = null;
+
+        try {
+            jRst = HXSdk.asyncOpenBillReceive(order, emisBaseInvoiceChInfo.getToken());
+        }catch(Exception ex){
+            ex.printStackTrace();
+            throw new EmisBizError(EmisBizErrorType.FAIL,"航信税金系统出错，请联系航信人员");
+        }
+
         // 如果token失效则重新获取token再触发一次
         /*
           "code": "B0301",