From 9de88e26d0d5bd5d31dbf74c64d45ef71d157111 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Mon, 25 Jul 2022 15:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml  |  2 +-
 .../mapper/system/BroadDataMapper.xml         | 63 ++++++++++++-------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 02b2fdf..3e533a0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -21,7 +21,7 @@ spring:
             # 最小连接池数量
             minIdle: 3
             # 最大连接池数量
-            maxActive: 6
+            maxActive: 12
             # 配置获取连接等待超时的时间
             maxWait: 60000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 6958245..8d50f82 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -811,35 +811,52 @@ where DETIAL_TYPE_CODE = '1004'
     <select id="mtk_selectOrderInfoBy3dTatle" resultType="com.ruoyi.system.domain.BoxOutput">
         select count(1) as qty, '订单数量' as name
         from IMOS_PR_ORDER
-        where FINISH_DATE between to_date(to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
-        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+        select DAY, ROWNUM as qt
+        from haiwei.BASE_PRODUCT_QTY
+        where DAY &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        order by DAY desc)
+        where qt &lt; 4)
         union
         select count(1) as qty, '完成数量'  as name
         from IMOS_PR_ORDER
-        where FINISH_DATE between to_date(
-        to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
-        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00',
-        'yyyy-MM-dd hh24:mi:ss')
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+        select DAY, ROWNUM as qt
+        from haiwei.BASE_PRODUCT_QTY
+        where DAY &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        order by DAY desc)
+        where qt &lt; 4)
         and ORDER_QTY - ACTUAL_QTY &lt; 6
         union
         select round(
         (
         select count(1)
         from IMOS_PR_ORDER
-        where FINISH_DATE between to_date(
-        to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
-        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00',
-        'yyyy-MM-dd hh24:mi:ss')
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+        select DAY, ROWNUM as qt
+        from haiwei.BASE_PRODUCT_QTY
+        where DAY &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        order by DAY desc)
+        where qt &lt; 4)
         and ORDER_QTY - ACTUAL_QTY &lt; 6
         ) /
         (
         select count(1)
         from IMOS_PR_ORDER
-        where FINISH_DATE between to_date(
-        to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00',
-        'yyyy-MM-dd hh24:mi:ss')
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+        select DAY, ROWNUM as qt
+        from haiwei.BASE_PRODUCT_QTY
+        where DAY &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        order by DAY desc)
+        where qt &lt; 4)
         ) * 100, 2) as qty, '清单率' as name
         from DUAL
         union
@@ -947,14 +964,16 @@ where DETIAL_TYPE_CODE = '1004'
              )
     </select>
     <select id="mtk_selectInstoreNumByday" resultType="com.ruoyi.system.domain.BoxOutput">
-        select substr(
-               MATERIAL_NAME,
-               instr(MATERIAL_NAME, '-', 1, 1) + 1,
-               instr(MATERIAL_NAME, ',', 1, 1) - 2 - instr(MATERIAL_NAME, '-', 1, 1) + 1) as name,
-       IN_QTY                                                                             as qty
-        from IMOS_PR_PRODUCT_IN
+        select   nvl(count(1),0) as qty,
 
-        where to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+               substr(
+                       MATERIAL_NAME,
+                       instr(MATERIAL_NAME, '-', 1, 1) + 1,
+                       instr(MATERIAL_NAME, ',', 1, 1) - 2 - instr(MATERIAL_NAME, '-', 1, 1) + 1) as name
+        from IMOS_PR_PRODUCT_BARCODE ippb
+        where DETIAL_TYPE_CODE = '1004'
+          and  to_char(SCAN_TIME, 'yyyy-MM-dd') =to_char(SYSDATE, 'yyyy-MM-dd')
+        group by MATERIAL_NAME
     </select>
 
     <resultMap id="MTKBeen" type="com.ruoyi.system.domain.MTKBeen">