From 48a392d9b171de4f81933100609428b06da1b0e0 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Sat, 1 Oct 2022 14:34:18 +0800
Subject: [PATCH] =?UTF-8?q?8012=E5=90=B8=E9=99=84=E5=86=85=E8=83=86?=
 =?UTF-8?q?=E9=A2=84=E8=A3=85=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java  | 2 +-
 .../com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java | 2 +-
 .../src/main/resources/mapper/system/ImosPrPlanMapper.xml    | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
index 34b1a8a..7ae01af 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ImosPrPlanMapper.java
@@ -160,7 +160,7 @@ public interface ImosPrPlanMapper
 
     List<OrderInfo> getAluminumPlanHourInfo(int in_id);
 
-    List<OrderInfo> getPreinstalledPlanHourInfo();
+    List<OrderInfo> getPreinstalledPlanHourInfo(int in_id);
 
     /**
      * 获取发泡库存
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
index 9cb345a..a0d2212 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
@@ -669,7 +669,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
 
     @Override
     public String getPreinstalledPlanHourInfo() {
-        List<OrderInfo> orderInfo = imosPrPlanMapper.getPreinstalledPlanHourInfo();
+        List<OrderInfo> orderInfo = imosPrPlanMapper.getPreinstalledPlanHourInfo(1);
 
         List<String> orderTypeList = new ArrayList<>();
         List<Long> planQtyList = new ArrayList<>();
diff --git a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
index 2b94aa4..5af11d5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
@@ -416,7 +416,7 @@ SELECT * FROM TABLE( SCADA_ABSORB_PLAN_QUERY_NEW(#{in_id}) )
 
     <!--吸附内胆预装小时计划-->
     <select id="getPreinstalledPlanHourInfo" parameterType="OrderInfo" resultMap="OrderInfoResult">
-        select substr(t1.MATERIAL_NAME,instr(t1.MATERIAL_NAME,',',1,1)+1,instr(t1.MATERIAL_NAME,',',1,2)-1-instr(t1.MATERIAL_NAME,',',1,1)) as order_type,
+        /*select substr(t1.MATERIAL_NAME,instr(t1.MATERIAL_NAME,',',1,1)+1,instr(t1.MATERIAL_NAME,',',1,2)-1-instr(t1.MATERIAL_NAME,',',1,1)) as order_type,
                sum(t1.PLAN_QTY) as planned_production,
                sum(t2.Cnt) as actual_production,
                t2.Order_Type as record_Time
@@ -428,7 +428,8 @@ SELECT * FROM TABLE( SCADA_ABSORB_PLAN_QUERY_NEW(#{in_id}) )
               and DEVICE_CODE='1004'
             group by MATERIAL_CODE,TO_CHAR(CREATION_DATE,'hh24')
         ) t2 on t1.MATERIAL_CODE = t2.MATERIAL_CODE
-        group by substr(t1.MATERIAL_NAME,instr(t1.MATERIAL_NAME,',',1,1)+1,instr(t1.MATERIAL_NAME,',',1,2)-1-instr(t1.MATERIAL_NAME,',',1,1)),t2.Order_Type
+        group by substr(t1.MATERIAL_NAME,instr(t1.MATERIAL_NAME,',',1,1)+1,instr(t1.MATERIAL_NAME,',',1,2)-1-instr(t1.MATERIAL_NAME,',',1,1)),t2.Order_Type*/
+        select * from TABLE ( scada_tank_preload_hours_new(#{in_id}) )
     </select>
 
     <select id="getHourPlan" resultType="com.ruoyi.system.domain.scada.HourData">