md

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","status"},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)
     {

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java

@@ -503,17 +503,33 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
 
         // 更新开票状态
         if( "00000".equals(jRst.getString("code")) ){
-            EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
+
-            newRecord.setId(old.getId());
+            // 检查是否发送成功
-            newRecord.setOpenChStatus("1");
+            JSONArray jArrFailList=jRst.getJSONArray("failDetails");
-            emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
+            if(!CollectionUtils.isEmpty(jArrFailList)){
-            // 更新状态为已发送状态
+                EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
-            updateEmisSettleInvoiceChRecord(newRecord);
+                newRecord.setId(old.getId());
+                newRecord.setOpenChStatus("1");
+                emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
+                // 更新状态为已发送状态
+                updateEmisSettleInvoiceChRecord(newRecord);
+            }else{
+                JSONObject item0=jArrFailList.getJSONObject(0);
+                EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
+                newRecord.setId(old.getId());
+                newRecord.setOpenChStatus("-1");
+                newRecord.setOpenChStatusDesc(item0.getString("failReason"));
+                emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
+                // 更新状态为已发送状态
+                updateEmisSettleInvoiceChRecord(newRecord);
+            }
+
+
         }
         else{
             EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
             newRecord.setId(old.getId());
-            newRecord.setOpenChStatus("1");
+            newRecord.setOpenChStatus("-1");
             newRecord.setOpenChStatusDesc(jRst.getString("message"));
             emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
         }

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java

@@ -505,10 +505,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
                 }
                 existsMap.put(uniqKey,1);
 
-                // 判断是否忽略自清自提
+
-                if("2".equals(mainWaybill.getCustomsClear())&&"1".equals(quotePriceItem.getBlIgnoreZt())){
-                    continue;
-                }
 
                 EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
 
@@ -593,9 +590,10 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
             Map existsMap = new HashMap();
             for (EmisTmsCostQuotePrice quotePriceItem : fixedQuotePrice1004List) {
 
-
+                // 判断是否忽略自清自提
-                if()
+                if("2".equals(mainWaybill.getCustomsClear())&&"1".equals(quotePriceItem.getBlIgnoreZt())){
-
+                    continue;
+                }
 
                 // 如果网点重复就忽略
                 String uniqKey = quotePriceItem.getStartSiteCode() + "-"+quotePriceItem.getNextSiteCode();

emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java

@@ -293,7 +293,7 @@ isOfferInvoiceDetail	String	N	1	是否需要提供明细 Y-提供，N-不提供
     }
 
 
-    public static void main2() {
+    public static void main() {
 
         /*
         {
@@ -477,21 +477,23 @@ APP Secret：8962fd753b054da88409b18743a6e7c0
     }
 
 
-    public static void main(String[] args) {
+    public static void main3(String[] args) {
 
         /*
         探路供应链（江苏）有限公司	91320104MAD3LBDK4E	cf6e11de453f441bbd35691cda6442e3
 江苏探路者国际物流有限公司	9132010469040698XG	8962fd753b054da88409b18743a6e7c0
 丝路卡航（江苏）物流服务有限公司	91320104MA258WWMX2	8c01cb064e57476abb95f4a4f37e6d20
 广西陆陆达国际物流有限公司	91451481MAA7B2672L	763d252d5b8c4dc0b39dddf2425d1fc8
-
+5	aisino	航信	探路供应链(上海)有限公司	91310112MA1GC97C6L
+18225860494	陶丽	91310112MA1GC97C6L	5cda67f772a5428b968a04ddccb6df85
+eyJhbGciOiJIUzUxMiJ9.eyJ1c2VySWQiOjE5MjU3OTgwMzUzMTkwOTkzOTMsImFjY291bnQiOiI5MTMxMDExMk1BMUdDOTdDNkwiLCJ1dWlkIjoiZjVhMjNiNWQtYjVhMC00NzczLThkYjUtOWY1OTM3ZTFkNTk3IiwicmVtZW1iZXJNZSI6ZmFsc2UsImV4cGlyYXRpb25EYXRlIjoxNzUyMTE2MzQ1NTIzLCJjYVRva2VuIjpudWxsLCJ0ZW5hbnRDb2RlIjoiOTEzMTAxMTJNQTFHQzk3QzZMIiwib3RoZXJzIjpudWxsLCJzdWIiOiIxOTI1Nzk4MDM1MzE5MDk5MzkzIiwiaWF0IjoxNzUxNTExNTQ1LCJleHAiOjE3NTIxMTYzNDV9.vstxrAJlbSyZQD7cOP0IT7y0ms504YHZ3c3OilsC8ddLRv6dZ5jveWaTqXnnYKAcsyOoLYtNKcPG9dVVl48LpA	2025-07-10 10:59:06		0		2024-07-24 12:40:29	1436	2025-07-03 10:59:06		88888
         */
 //        main2();
 
 //        String token=getToken("9132010469040698XG","8962fd753b054da88409b18743a6e7c0");
-        String token=getToken("91320104MAD3LBDK4E","cf6e11de453f441bbd35691cda6442e3");
+        String token=getToken("91310112MA1GC97C6L","5cda67f772a5428b968a04ddccb6df85");
 //        JSONObject jRstObj=HXSdk.queryInvoiceResult("TST2024072400-2",token);
-        JSONObject jRstObj=HXSdk.queryInvoiceResult("1821059286583738368",token);
+        JSONObject jRstObj=HXSdk.queryInvoiceResult("1942102373551833088",token);
 
         // 立即查询状态
         System.out.println(jRstObj.toJSONString());