8012吸附内胆预装数据监控平台修改

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);
 
     /**
      * 获取发泡库存

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<>();

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">