From 75b42102fb9ea080aa66d5cb6c2bbfa362acc0f8 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 15 Jul 2022 16:49:53 +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

---
 .../controller/broad/BoxBroadController.java  |  1 +
 .../ruoyi/system/mapper/BroadDataMapper.java  |  2 +-
 .../service/impl/BroadDataServiceImpl.java    |  2 +-
 .../mapper/system/BroadDataMapper.xml         | 30 +++++++++++--------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
index 54a3389..0641a28 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
@@ -66,6 +66,7 @@ public class BoxBroadController {
 
 
     @PostMapping("/getProductPlanInfo")
+    @ApiOperation("箱壳工单详情")
     public String getProductPlanInfo() {
         List<OrderInfo> planInfo = service.getUHullPlanInfo("1002");
         String jsonInfo = JSONArray.toJSONString(planInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
index 9a2c79f..3c7d05e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Repository
 public interface BroadDataMapper {
-    BoxPlanCompletion selectplanCompletion(String gxid);
+    BoxPlanCompletion selectplanCompletion();
 
     List<BoxStock> selectStock(String id);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
index 1a75cfd..7c99148 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
@@ -25,7 +25,7 @@ public class BroadDataServiceImpl implements IBroadDataService
 
     @Override
     public BoxPlanCompletion selectplanCompletion(String gxid) {
-        return mapper.selectplanCompletion(gxid);
+        return mapper.selectplanCompletion();
     }
 
     @Override
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 1950e8e..215eb02 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -12,15 +12,19 @@
     </resultMap>
 
     <select id="selectplanCompletion" resultType="com.ruoyi.system.domain.BoxPlanCompletion">
-        select nvl(sum(PLAN_QTY), 0)   planned_number,
-               nvl(sum(actual_qty), 0) quantity_number,
-               plan_shift
+        select (SELECT *
+                FROM (select PLAN_NUMBER
+                      from haiwei.BASE_BOX_PLAN
+                      where rownum = 1
+                      ORDER BY CREATE_TIME DESC)) AS planned_number,
+               nvl(sum(actual_qty), 0)            AS quantity_number
+
         from IMOS_PR_PLAN
         where plan_date is not null
-          and process_code = #{gxid}
+          and process_code = 1002
           and delete_flag = '0'
           and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
-        group by to_char(plan_date, 'yyyy-MM-dd'), PLAN_SHIFT
+        group by to_char(plan_date, 'yyyy-MM-dd')
     </select>
 
     <select id="selectStock" resultType="com.ruoyi.system.domain.BoxStock">
@@ -89,7 +93,7 @@
                PLAN_QTY                           as plan_number,
                ACTUAL_QTY                         as actual_number,
                round(ACTUAL_QTY / PLAN_QTY * 100,2) as rate,
-               START_TIME
+               START_TIME as day
         from IMOS_PR_PLAN t
         where process_code = 1002
           and delete_flag = '0'
@@ -98,12 +102,14 @@
     </select>
 
     <select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
-        select TO_CHAR(CREATION_DATE, 'hh24') as name ,Count(TASK_ID) as qty
-        from IMOS_LO_TASK_HISTORY
-        where detial_type_code = '1002' and TASK_TYPE !='O'
-        and TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
-        group by TO_CHAR(CREATION_DATE, 'hh24')
-        order by TO_CHAR(CREATION_DATE, 'hh24')
+          select TO_CHAR(CREATION_DATE, 'hh24')||':30' as name  ,Count(TASK_ID) as qty
+          from IMOS_LO_TASK_HISTORY
+          where detial_type_code = '1002'
+            and TASK_TYPE != 'O'
+            and TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
+            and TO_CHAR(CREATION_DATE, 'hh24') > 7
+          group by TO_CHAR(CREATION_DATE, 'hh24')
+          order by name
     </select>