From f6a07a41b9b1daa8fb727ee345059963724b0d41 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 30 Apr 2025 11:11:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=E8=8E=B7=E5=8F=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E8=B4=A6=E6=9C=9F=E5=86=85/=E8=B6=85=E6=9C=9F=E9=A2=9D?=
 =?UTF-8?q?=E5=BA=A6=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index a25bc16d9..e88fe1e12 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1764,6 +1764,16 @@
                 )
             </if>
 
+            <!-- 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度 -->
+            <if test="params.queryQuotaType != null and params.queryQuotaType == 1">
+                and a.send_date is not null
+                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60)
+            </if>
+            <if test="params.queryQuotaType != null and params.queryQuotaType == 2">
+                and a.send_date is not null
+                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) <![CDATA[ <= ]]> (10 * 24 * 60 * 60)
+            </if>
+
 
             <if test="params.waybillStatType != null and params.waybillStatType == 1">
                 and a.order_type='0'

From 1d3a29721f2055606573af9339279f78c50edfc0 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 30 Apr 2025 11:29:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=E6=9F=A5=E8=AF=A2=E6=B5=B7?=
 =?UTF-8?q?=E8=BF=90=E7=BD=91=E7=82=B9=E6=8E=A5=E5=8F=A3=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xdadan/erp/web/emis/EmisSiteController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
index 94ee043f5..94406b93a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
@@ -94,7 +94,7 @@ public class EmisSiteController extends EmisBaseController
     /**
      * 查询海运网点
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisSite:listSeaWay')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisSite:listSeaWay')")
     @JacksonFilter(include= {"id","siteCode","siteName","siteNameEn","parentSiteCode","province","provinceName","sizeCode2","sizeCode3"},value=EmisSite.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSeaWay")
     public TableDataInfo listSeaWay(EmisSite emisSite)