From a46a6313109fbc09c771d7f265d99a7c8b61dd26 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 2 Aug 2024 16:40:50 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    | 21 +++++++++++++++++++
 .../impl/EmisTmsScanRecordServiceImpl.java    |  1 +
 .../erp/emis/service/openbill/hx/HXSdk.java   |  7 ++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

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 ec8000d8a..9a66ce2de 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
@@ -469,6 +469,27 @@ public class EmisCommonController extends EmisBaseController
 
     }
 
+
+    @GetMapping("/autoQueryInvoiceStatusTrigger")
+    public AjaxResult autoQueryInvoiceStatusTrigger(){
+        String lockKey="autoQueryInvoiceStatusTrigger";
+        log.error("autoQueryInvoiceStatusTrigger start");
+
+        // 加锁查询
+        redissonService.lock(lockKey,300);
+        try{
+            emisBaseService.autoDoSmsSend();
+        }catch(Exception ex){
+            ex.printStackTrace();
+            log.error("autoQueryInvoiceStatusTrigger exception:"+ex.getMessage());
+        }
+        log.error("autoQueryInvoiceStatusTrigger end");
+
+        redissonService.unlock(lockKey);
+        return AjaxResult.success("发送成功");
+
+    }
+
     /**
      * 单独出账
      * @return
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index b57d4aca6..360bf0a87 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -1555,6 +1555,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
 
                 // 插入主单扫描记录
+                emisTmsScanRecord.setId(null);
                 emisTmsScanRecord.setBillCode(mainBillCode);
                 emisTmsScanRecord.setMainBillCode(mainBillCode);
                 emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
index 92637599c..e3d4a40fd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
@@ -218,7 +218,7 @@ public class HXSdk {
 
     /**
      * 开票查询
-     * @param order
+     * @param orderNo
      * @param token
      * @return
      */
@@ -478,9 +478,10 @@ APP Secret：8962fd753b054da88409b18743a6e7c0
 
 //        main2();
 
-        String token=getToken("9132010469040698XG","8962fd753b054da88409b18743a6e7c0");
+//        String token=getToken("9132010469040698XG","8962fd753b054da88409b18743a6e7c0");
+        String token=getToken("91320104MAD3LBDK4E","cf6e11de453f441bbd35691cda6442e3");
 //        JSONObject jRstObj=HXSdk.queryInvoiceResult("TST2024072400-2",token);
-        JSONObject jRstObj=HXSdk.queryInvoiceResult("1819191643446706176",token);
+        JSONObject jRstObj=HXSdk.queryInvoiceResult("1819266505825583104",token);
 
         System.out.println(jRstObj.toJSONString());