Merge remote-tracking branch 'origin/master'

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'
         //生产计划工单
@@ -560,7 +560,7 @@
         ],
         series: [
             {
-                name: '内胆积存库',
+                name: '内胆集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {
@@ -592,7 +592,7 @@
                 },
             },
             {
-                name: '围板积存库',
+                name: '围板集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {

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>
 
@@ -69,8 +73,14 @@
                           end) as name,
                SUM(ACTUAL_QTY) as qty
         from IMOS_PR_PLAN
-        where to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+        where
+--         to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+            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')
           and PROCESS_CODE = 1002
+          and ACTUAL_QTY!=0
         group by MATERIAL_NAME
     </select>