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 e3d4a40fd..107b9e6f2 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
@@ -3,8 +3,10 @@ package com.xdadan.erp.emis.service.openbill.hx;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
@@ -483,7 +485,46 @@ APP Secret:8962fd753b054da88409b18743a6e7c0
// JSONObject jRstObj=HXSdk.queryInvoiceResult("TST2024072400-2",token);
JSONObject jRstObj=HXSdk.queryInvoiceResult("1819266505825583104",token);
+ // 立即查询状态
System.out.println(jRstObj.toJSONString());
+ if ("00000".equals(jRstObj.getString("code"))) {
+ JSONObject data = jRstObj.getJSONObject("data");
+ JSONArray jInvoiceInfos = data.getJSONArray("invoiceInfos");
+ if (!CollectionUtils.isEmpty(jInvoiceInfos)) {
+
+ JSONObject item0 = jInvoiceInfos.getJSONObject(0);
+ System.out.println(item0.toJSONString());
+ if ("2".equals(item0.getString("status"))) {
+
+ System.out.println(item0.getString("invoiceNo"));
+// updRecord.setFilePath(item0.getString("pdfUrl"));
+// updRecord.setInvoiceNo(item0.getString("invoiceNo"));
+//// updRecord.setRemark(jQRst.toJSONString());
+// updRecord.setOpenChStatus(item0.getString("status"));
+//
+// updRecord.setOpenChStatusDesc("已查询开票");
+ /*
+ status string Y 2 发票状态:
+ 0:待开票;
+ 1:开票中;
+ 2:开票完成;
+ 3:发票已作废 ;
+ 4:发票已红冲-全额 ;
+ 5:发票已红冲-部分;
+ 6:开票失败;
+ */
+
+
+ } else {
+// updRecord.setOpenChStatus("-1");
+// updRecord.setOpenChStatusDesc(item0.getString("returnStatusMsg"));
+ }
+
+ }
+ }
+
+
+
//{"code":"00000","data":{"invoiceInfos":[{"listFlag":"N","naturalPersonFlag":"0","buyerBankAccount":"320899991013001239978","pushMode":"-1","exTaxAmount":1.00,"returnStatus":"E9638","buyerAddress":"南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1527号","salerBank":"中国工商银行南京市新街口支行","invoiceType":"1","model":"normal","showBankAccountType":"0","specificFactor":"0","buyerBank":"交通银行股份有限公司南京新街口支行","orderNo":"TST2024072400-2","deliverEmail":"linfso@126.com","salerBankAccount":"4301010009100803890","withTaxFlag":"1","salerNaturalPersonFlag":"0","taxAmount":0.00,"orderDate":"2024-07-24 16:50:38","status":"0","buyerTel":"4000251756","salerName":"江苏探路者国际物流有限公司","orderAmount":1.00,"buyerTaxNum":"91320104MA258WWMX2","invoiceLine":"p","salerTel":"025-85657080","returnStatusMsg":"第1条明细中零税率标识为非零税率时,税率不能为0%","buyerName":"丝路卡航(江苏)物流服务有限公司","salerAddress":"南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1137号","invoiceSerialNum":"1816033232493576194","salerTaxNum":"9132010469040698XG"}]},"success":true,"message":"请求成功"}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6b1d974e4..412c67cc5 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1543,6 +1543,15 @@
and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
and a.send_site_code= #{sendSiteCode}
+ and a.cust_no=#{custNo}
+ and a.trans_line_type=#{transLineType}
+ and a.product_type=#{productType}
+
+ and a.send_company like concat('%', #{sendCompany}, '%')
+ and a.take_piece_employee_code=#{takePieceEmployeeCode}
+ and a.operate_employee_code=#{operateEmployeeCode}
+
+
and a.send_date = ]]> #{params.beginDate}