From ee4d420ea41188bb20da734942c0068b880718ca Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Tue, 19 Jul 2022 11:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/broad/box.html   | 8 ++++----
 .../src/main/resources/mapper/system/BroadDataMapper.xml  | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html
index fe6ce52..e981b2b 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/box.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/box.html
@@ -384,8 +384,8 @@
         })
     }
 
-    const rowName1 = '内胆积存库'
-    const rowName2 = '围板积存库'
+    const rowName1 = '内胆集存库'
+    const rowName2 = '围板集存库'
     $(() => {
         let url = '/broad/box'
         //生产计划工单
@@ -557,7 +557,7 @@
         ],
         series: [
             {
-                name: '内胆积存库',
+                name: '内胆集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {
@@ -589,7 +589,7 @@
                 },
             },
             {
-                name: '围板积存库',
+                name: '围板集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index a8295cf..ead3c14 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -23,7 +23,11 @@
         where plan_date is not null
           and process_code = 1002
           and delete_flag = '0'
-          and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+--           and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+ and CREATION_DATE between
+    to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss')
+    and
+    to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
         group by to_char(plan_date, 'yyyy-MM-dd')
     </select>