From 6ab9ba84d8535e27a5b73f5cb1726d8e5ea91e64 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 17 Dec 2024 06:58:20 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   |  9 ++++
 .../erp/emis/mapper/EmisWaybillMapper.java    |  3 ++
 .../erp/emis/service/EmisBaseService.java     | 12 +++++
 .../resources/mapper/EmisWaybillMapper.xml    | 48 +++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 499cfea84..89f3a1691 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -1441,6 +1441,15 @@ public class EmisWaybillController extends EmisBaseController
     }
 
 
+    //    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:query')")
+    @GetMapping("/getLatestMonthCreateOrderMapList")
+    public AjaxResult getInfoByBillCode(EmisWaybill emisWaybill)
+    {
+        setPrivParams(emisWaybill);
+        return AjaxResult.success(emisBaseService.selectLatestMonthCreateOrderMapList(emisWaybill));
+    }
+
+
 //    /**
 //     * 导出运单列表列表
 //     */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index 122d01dea..b2b8d2683 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -204,6 +204,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public List<Map> getSiteDestStatInfoMap(EmisWaybill emisWaybill);
 
+    public List<Map> selectLatestMonthCreateOrderMapList(EmisWaybill emisWaybill);
+
+
 
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 1fcb6c0c5..e0a15aaa9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -2762,6 +2762,18 @@ public class EmisBaseService {
          return emisTmsScanRecordMapper.queryScanStatInfoDtlList(emisWaybill);
      }
 
+
+     /**
+      * 获取最近创建订单统计列表信息
+      * @param emisWaybill
+      * @return
+      */
+     public List<Map> selectLatestMonthCreateOrderMapList(EmisWaybill emisWaybill){
+         return emisWaybillMapper.selectLatestMonthCreateOrderMapList(emisWaybill);
+     }
+
+
+
      /**
       * 根据添加的地址增加客户
       * @param emisCustomerAddressNew
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index c14107779..14198a35e 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1345,6 +1345,54 @@
 
     </select>
 
+    <select id="selectLatestMonthCreateOrderMapList" parameterType="EmisWaybill" resultType="map">
+        SELECT
+            DATE_FORMAT( create_time, '%Y-%m-%d' ) AS createDay,
+            count( 1 ) AS totalNum
+        FROM
+            emis_waybill a
+        WHERE
+             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
+             and create_time <![CDATA[ >= ]]>   DATE_SUB( CURDATE(), INTERVAL 1 MONTH )
+             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+
+                a.send_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{params.privSiteCode} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                UNION
+                SELECT #{params.privSiteCode} FROM dual
+                )
+                or
+                a.dispatch_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{params.privSiteCode} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                UNION
+                SELECT #{params.privSiteCode} FROM dual
+                )
+                <if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
+                    or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
+                </if>
+
+                <if test="custNo != null and custNo != ''">
+                    or EXISTS (
+                    select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
+                    )
+                </if>
+
+                or a.salesmen=#{params.privEmpName}
+                or a.payee=#{params.privEmpName}
+                or a.operate_employee_code=#{params.privEmpCode}
+                or a.take_piece_employee_code=#{params.privEmpCode}
+                )
+            </if>
+        GROUP BY
+            createDay
+    </select>
 
 
     <!--    寄件网点寄件统计-->