diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
index b3acfc6..0c8e3da 100644
--- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
+++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
@@ -2,26 +2,27 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1.0">
+    <meta content="width=device-width,initial-scale=1.0"
+          name="viewport">
     <title>发泡SCADA数据平台</title>
-    <meta name="description" content="U壳钣金SCADA数据平台">
-    <link href="../../static/css/main-style.css" th:href="@{/css/main-style.css}" rel="stylesheet"/>
-<!--    <link href="../../static/css/materialdesignicons.min.css" th:href="@{/css/materialdesignicons.min.css}" rel="stylesheet"/>-->
+    <meta content="U壳钣金SCADA数据平台" name="description">
+    <link href="../../static/css/main-style.css" rel="stylesheet" th:href="@{/css/main-style.css}"/>
+    <!--    <link href="../../static/css/materialdesignicons.min.css" th:href="@{/css/materialdesignicons.min.css}" rel="stylesheet"/>-->
     <!-- 360浏览器急速模式 -->
-    <meta name="renderer" content="webkit">
+    <meta content="webkit" name="renderer">
     <!-- 避免IE使用兼容模式 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="../../static/css/autoscroll-table.css" th:href="@{/css/autoscroll-table.css}">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <link href="../../static/css/autoscroll-table.css" rel="stylesheet" th:href="@{/css/autoscroll-table.css}">
 
 </head>
 <style>
-    .top-mid-Text-status{
+    .top-mid-Text-status {
         position: absolute;
-        top:14%;
-        width:0;
-        height:0;
+        top: 14%;
+        width: 0;
+        height: 0;
     }
+
     #top-left {
         border: 0px solid red;
         position: absolute;
@@ -61,10 +62,10 @@
         left: 30%;
     }
 
-    .top-mid-Text{
+    .top-mid-Text {
         height: 26.5%;
-        width:5%;
-        border:0px solid black;
+        width: 5%;
+        border: 0px solid black;
         font-size: 16%;
         display: flex;
         align-items: center;
@@ -101,7 +102,6 @@
     }
 
 
-
     #bottom-mid {
         position: absolute;
         width: 43.3%;
@@ -111,7 +111,6 @@
     }
 
 
-
     #oee {
         position: absolute;
         top: 14%;
@@ -249,64 +248,64 @@
 
 
 <div class="my-transition">
-    <div id="bottom-left" ></div>
+    <div id="bottom-left"></div>
 </div>
 
 <div class="my-transition2">
-    <div id="bottom-left-2" ></div>
+    <div id="bottom-left-2"></div>
 </div>
 
 <!--中间数据-->
 <div id="top-mid">
     <!--当时计划-->
     <div class="top-mid-Text" style="position: absolute;top:2%;color: #6fd4ff;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:7.7%;color: #6fd4ff;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:14.9%;color: #6fd4ff;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:22.3%;color: #6fd4ff;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <!--当前计划-->
     <div class="top-mid-Text" style="position: absolute;top:2%;left:36.5%; color: #6fff85;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:43.8%; color: #6fff85;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:51.1%; color: #6fff85;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:58.4%; color: #6fff85;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <!--实际产量-->
     <div class="top-mid-Text" style="position: absolute;top:2%;left:72.3%; color: #ffff6d;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:79.9%; color: #ffff6d;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:87.3%; color: #ffff6d;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <div class="top-mid-Text" style="position: absolute;top:2%;left:94.6%; color: #ffff6d;">
-        <span >-</span>
+        <span>-</span>
     </div>
 
     <!--当日计划-->
@@ -315,27 +314,27 @@
 
 <!--运行状态-->
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left: 33%;">
-    <img alt="运行状态" id="status-a" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-a" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
 </div>
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:39%">
-    <img alt="运行状态" id="status-b" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-b" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
 </div>
 
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:44.5%">
-    <img alt="运行状态" id="status-c" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-c" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
 </div>
 
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:50.5%">
-    <img alt="运行状态" id="status-d" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-d" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
 </div>
 
 <!--运行状态-->
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:59.5%">
-    <img alt="运行状态" id="status-sys1" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-sys1" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
     <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
 </div>
 <div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:67%">
-    <img alt="运行状态" id="status-sys2" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <img alt="运行状态" id="status-sys2" src="../../static/img/runImg.png" style="width:2vw" th:src="@{/img/runImg.png}"/>
     <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
 </div>
 
@@ -358,8 +357,8 @@
 
 <script src="../../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 <script src="../../static/js/update-split-blocks.js" th:src="@{/js/update-split-blocks.js}"></script>
-<th:block th:include="include :: footer" />
-<th:block th:include="include :: echarts-js" />
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: echarts-js"/>
 <script src="../../static/js/date-time-common.js" th:src="@{/js/date-time-common.js}"></script>
 <script src="../../static/js/autoscroll-table.js" th:src="@{/js/autoscroll-table.js}"></script>
 
@@ -368,9 +367,9 @@
     //夹具生产计划切换
     showalert();
 
-    window.setInterval(showalert, 1000*30);
-    function showalert()
-    {
+    window.setInterval(showalert, 1000 * 30);
+
+    function showalert() {
         var myTransition = $('.my-transition');
         var myTransition2 = $('.my-transition2');
         if (myTransition.hasClass('my-click-transiton')) {
@@ -383,7 +382,6 @@
     }
 
 
-
     const orderInfColumns = [
         "型号",
         "计划数",
@@ -408,11 +406,11 @@
     }
 
     const planInfo = new AutoScrollTable(document.getElementById("bottom-left"), [], {
-        width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
+        width: [null, "7%", "5%", "5%", "8%", "5%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
     })
 
     const planInfo2 = new AutoScrollTable(document.getElementById("bottom-left-2"), [], {
-        width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
+        width: [null, "7%", "5%", "5%", "8%", "5%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
     })
 
     function updateStatus(id, status) {
@@ -430,14 +428,14 @@
     $(() => {
         autoUpdate('/system/FoamerMes/getOrderInfo2', INTERVAL, data => {
             // orderInf.loadData(data, Object.keys(orderInfColumns))
-            orderInf.loadData(data.map(value => [getSC(value.orderType), value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${orderAgv(value.plannedProduction,value.actualProduction)}%`]), Object.keys(orderInfColumns))
+            orderInf.loadData(data.map(value => [getSC(value.orderType), value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${orderAgv(value.plannedProduction, value.actualProduction)}%`]), Object.keys(orderInfColumns))
         })
 
-        const orderAgv = function (plannedProduction,actualProduction) {
-            if(plannedProduction == 0){
+        const orderAgv = function (plannedProduction, actualProduction) {
+            if (plannedProduction == 0) {
                 return 0;
             }
-            if(actualProduction == 0){
+            if (actualProduction == 0) {
                 return 0;
             }
 
@@ -453,71 +451,50 @@
             }
         })
 
+        let filter = (arr, key, value, key2) => {
+            return arr.filter(e => e[key] === value)?.[0]?.[key2]
+        }
+        let totle = (arr, i) => {
+            return arr.map((e, index) => {
+                if (index !== 0) {
+                    return e[i]
+                } else {
+                    return 0
+                }
+            }).reduce((a, b) => a + b)
+        }
         autoUpdate('/system/FoamerMes/getPlanHourInfo', INTERVAL, data => {
-            // orderInf.loadData(data, Object.keys(orderInfColumns))
-            let consolidatedRow = ["", "合计", ""]
-
-            for (let i = 3; i < 19; i++) {
-                if (i === 6) {
-                    consolidatedRow.push(`${(consolidatedRow[5] / consolidatedRow[4] * 100).toFixed(1)}%`)
-                    continue
+            let name = []
+            let dataA = []
+            let dataB = []
+            dataA.push(['型号', '状态', '目标', '计划', '累计', '达成率', '8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00'])
+            dataB.push(['型号', '状态', '目标', '计划', '累计', '达成率', '8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00'])
+            data.forEach(e => {
+                if (!name.includes(e.orderType)) {
+                    name.push(e.orderType)
                 }
-
-                let sum = 0
-
-                for (let j = 1; j < data.length; j++) {
-                    let d = data[j][i]
-                    if (!d || d === '') {
-                        continue
-                    }
-                    if (typeof d === 'string') {
-                        d = parseInt(d)
-                    }
-
-                    sum += d
+            })
+            name.forEach((val, index) => {
+                if (index < 6) {
+                    let arr = data.filter(e => e.orderType === val)
+                    let plannedProduction = arr.map(e => e.plannedProduction).reduce((a, b) => a + b) || 0
+                    let actualProduction = arr.map(e => e.actualProduction).reduce((a, b) => a + b) || 0
+                    dataA.push([val.split(',')[0], '正常', arr[0].target, plannedProduction, actualProduction, plannedProduction === 0 ? '0%' : ((actualProduction / plannedProduction) * 100).toString().substr(0, 5) + '%', filter(arr, 'recordTime', 8, 'actualProduction') || 0, filter(arr, 'recordTime', 9, 'actualProduction') || 0, filter(arr, 'recordTime', 10, 'actualProduction') || 0, filter(arr, 'recordTime', 11, 'actualProduction') || 0, filter(arr, 'recordTime', 12, 'actualProduction') || 0, filter(arr, 'recordTime', 13, 'actualProduction') || 0, filter(arr, 'recordTime', 14, 'actualProduction') || 0, filter(arr, 'recordTime', 15, 'actualProduction') || 0, filter(arr, 'recordTime', 16, 'actualProduction') || 0, filter(arr, 'recordTime', 17, 'actualProduction') || 0, filter(arr, 'recordTime', 18, 'actualProduction') || 0, filter(arr, 'recordTime', 19, 'actualProduction') || 0])
+                } else {
+                    let arr = data.filter(e => e.orderType === val)
+                    let plannedProduction = arr.map(e => e.plannedProduction).reduce((a, b) => a + b) || 0
+                    let actualProduction = arr.map(e => e.actualProduction).reduce((a, b) => a + b) || 0
+                    dataB.push([val.split(',')[0], '正常', arr[0].target, plannedProduction, actualProduction, plannedProduction === 0 ? '0%' : ((actualProduction / plannedProduction) * 100).toString().substr(0, 5) + '%', filter(arr, 'recordTime', 8, 'actualProduction') || 0, filter(arr, 'recordTime', 9, 'actualProduction') || 0, filter(arr, 'recordTime', 10, 'actualProduction') || 0, filter(arr, 'recordTime', 11, 'actualProduction') || 0, filter(arr, 'recordTime', 12, 'actualProduction') || 0, filter(arr, 'recordTime', 13, 'actualProduction') || 0, filter(arr, 'recordTime', 14, 'actualProduction') || 0, filter(arr, 'recordTime', 15, 'actualProduction') || 0, filter(arr, 'recordTime', 16, 'actualProduction') || 0, filter(arr, 'recordTime', 17, 'actualProduction') || 0, filter(arr, 'recordTime', 18, 'actualProduction') || 0, filter(arr, 'recordTime', 19, 'actualProduction') || 0])
                 }
+            })
+            dataA.push(['合计', '', totle(dataA, 2), totle(dataA, 3), totle(dataA, 4), totle(dataB, 3) === 0 ? '0%' : ((totle(dataA, 4) / totle(dataA, 3)) * 100).toString().substr(0, 5) + '%', totle(dataA, 6), totle(dataA, 7), totle(dataA, 8), totle(dataA, 9), totle(dataA, 10), totle(dataA, 11), totle(dataA, 12), totle(dataA, 13), totle(dataA, 14), totle(dataA, 15), totle(dataA, 16), totle(dataA, 17)])
+            dataB.push(['合计', '', totle(dataB, 2), totle(dataB, 3), totle(dataB, 4), totle(dataB, 3) === 0 ? '0%' : ((totle(dataB, 4) / totle(dataB, 3)) * 100).toString().substr(0, 5) + '%', totle(dataB, 6), totle(dataB, 7), totle(dataB, 8), totle(dataB, 9), totle(dataB, 10), totle(dataB, 11), totle(dataB, 12), totle(dataB, 13), totle(dataB, 14), totle(dataB, 15), totle(dataB, 16), totle(dataB, 17)])
 
-                consolidatedRow.push(sum.toString())
-            }
-
-            data.push(consolidatedRow)
 
-            planInfo.loadData(data, 19, {
+            planInfo.loadData(dataA, 18, {
                 includeHead: true,
             })
-            //data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`]
-        })
-
-        autoUpdate('/system/FoamerMes/getPlanHourInfo2', INTERVAL, data => {
-            // orderInf.loadData(data, Object.keys(orderInfColumns))
-            let consolidatedRow = ["", "合计", ""]
-
-            for (let i = 3; i < 19; i++) {
-                if (i === 6) {
-                    consolidatedRow.push(`${(consolidatedRow[5] / consolidatedRow[4] * 100).toFixed(1)}%`)
-                    continue
-                }
-
-                let sum = 0
-
-                for (let j = 1; j < data.length; j++) {
-                    let d = data[j][i]
-                    if (!d || d === '') {
-                        continue
-                    }
-                    if (typeof d === 'string') {
-                        d = parseInt(d)
-                    }
-
-                    sum += d
-                }
-
-                consolidatedRow.push(sum.toString())
-            }
-
-            data.push(consolidatedRow)
-
-            planInfo2.loadData(data, 19, {
+            planInfo2.loadData(dataB.length > 2 ? dataB : dataA, 18, {
                 includeHead: true,
             })
         })
@@ -565,7 +542,7 @@
             updateStatus("status-d", data.status4)
         })
 
-        autoUpdate('/system/FoamerMes/getFoamDeviceInfo?deviceId='+"HF202009858", INTERVAL, data => {
+        autoUpdate('/system/FoamerMes/getFoamDeviceInfo?deviceId=' + "HF202009858", INTERVAL, data => {
             updateStatus("status-sys1", data.status)
             updateStatus("status-sys2", data.status2)
         })
@@ -573,7 +550,7 @@
         autoUpdate('/system/FoamerMes/getFoamTemp', INTERVAL, res => {
 
 
-            myEcharts(res,document.getElementById("top-right"));
+            myEcharts(res, document.getElementById("top-right"));
         })
 
         autoUpdate("/system/FoamerMes/flawRate", INTERVAL, data => {
@@ -586,8 +563,8 @@
                     {
                         name: '不良率',
                         data: [
-                            {value: flaw, name: rate.toFixed(2)+'%'},
-                            {value: total-flaw, name: ''},
+                            {value: flaw, name: rate.toFixed(2) + '%'},
+                            {value: total - flaw, name: ''},
                         ],
                     }
                 ]
@@ -617,8 +594,8 @@
                     {
                         name: '数量',
                         data: data,
-                        label:{
-                            normal:{
+                        label: {
+                            normal: {
                                 show: true,
                                 position: 'top',
                                 color: '#02FEA9'
@@ -637,7 +614,7 @@
             type: 'category',
             axisLabel: {
                 color: '#ffffff',
-                fontSize:'10',
+                fontSize: '10',
                 rotate: -30,
             },
         },
@@ -649,12 +626,12 @@
             splitLine: {
                 show: false,
             },
-            interval:90,
+            interval: 90,
         },
-        series : [
+        series: [
             {
-                name:'数量',
-                type:'bar',
+                name: '数量',
+                type: 'bar',
                 barWidth: 16,
                 itemStyle: {
                     normal: {
@@ -676,8 +653,8 @@
                         )
                     }
                 },
-                label:{
-                    normal:{
+                label: {
+                    normal: {
                         show: true,
                         position: 'top',
                         color: '#0F8EEF'
@@ -705,7 +682,7 @@
         xAxis: {
             type: 'category',
             axisLabel: {
-                fontSize:'10px',
+                fontSize: '10px',
                 color: '#ffffff'
             }
         },
@@ -717,12 +694,12 @@
             splitLine: {
                 show: false,
             },
-            interval:15,
+            interval: 15,
         },
-        series : [
+        series: [
             {
-                name:'数量',
-                type:'bar',
+                name: '数量',
+                type: 'bar',
                 barWidth: 16,
                 itemStyle: {
                     normal: {
@@ -744,8 +721,8 @@
                         )
                     }
                 },
-                label:{
-                    normal:{
+                label: {
+                    normal: {
                         show: true,
                         position: 'top',
                         color: '#02FEA9'
@@ -871,7 +848,7 @@
 </script>
 
 <script type="text/javascript">
-    const myEcharts = (res,ids) =>{
+    const myEcharts = (res, ids) => {
         let charts = echarts.init(ids);
 
         let option = {
@@ -915,7 +892,7 @@
                     splitLine: {
                         show: false,
                     },
-                    axisLabel:{
+                    axisLabel: {
                         show: true,
                     },
                     axisTick: {
@@ -927,9 +904,9 @@
             yAxis: [
                 {
                     type: "value",
-                    name:"℃",
-                    nameTextStyle:{
-                        color:'rgba(219,225,255,1)'
+                    name: "℃",
+                    nameTextStyle: {
+                        color: 'rgba(219,225,255,1)'
                     },
                     axisLabel: {
                         textStyle: {
@@ -949,12 +926,12 @@
                         },
                     },
                     splitLine: {//分割线配置
-                        show:false,
+                        show: false,
                         lineStyle: {
                             color: "rgba(219,225,255,1)",
                         }
                     },
-                    interval:20,
+                    interval: 20,
                 },
             ],
             series: res.series,
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
index ddb8a9a..0707838 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 import com.ruoyi.system.domain.BaseLocationInfo;
 import com.ruoyi.system.domain.scada.OrderInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 库位信息Mapper接口
@@ -91,4 +92,12 @@ public interface BaseLocationInfoMapper
      * @return 结果
      */
     public int deleteBaseLocationInfoByObjids(String[] objids);
+
+    /**
+     * 查询库位信息列表_函数
+     * @param in_id
+     * @param storeCode
+     * @return
+     */
+    List<BaseLocationInfo> selectBaseLocationInfoListNew(@Param("in_id") int in_id, @Param("storeCode")String storeCode);
 }
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 6f81533..1f77abf 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
@@ -82,7 +82,7 @@ public interface ImosPrPlanMapper
      * @date 2021/12/28 13:34
      * @return java.util.List<com.ruoyi.system.domain.scada.OrderInfo>
      */
-    List<OrderInfo> getClassTeamProInfo();
+    List<OrderInfo> getClassTeamProInfo(int in_id);
 
     /**
      * 发泡计划信息查询
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordOutstoreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordOutstoreMapper.java
index 2824535..6ca8a31 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordOutstoreMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordOutstoreMapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.RecordOutstore;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,12 @@ public interface RecordOutstoreMapper
      * @return 结果
      */
     public int deleteRecordOutstoreByObjids(String[] objids);
+
+    /**
+     * 查询出库记录列表 函数
+     * @param in_id
+     * @param storeCode
+     * @return
+     */
+    List<RecordOutstore> selectRecordOutstoreListNew(@Param("in_id") int in_id,@Param("storeCode") String storeCode);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAbsorbMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAbsorbMapper.java
index b5cd08f..2ca18aa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAbsorbMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAbsorbMapper.java
@@ -23,5 +23,5 @@ public interface ScadaAbsorbMapper {
 
     public String selectScadaAdsorbDeviceOEE(int in_id);
 
-    public String selectScadaAdsorbDeviceAlarmCount();
+    public String selectScadaAdsorbDeviceAlarmCount(int in_id);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
index 42f9d4b..616b868 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.system.domain.scada.OrderInfo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BaseLocationInfoMapper;
 import com.ruoyi.system.domain.BaseLocationInfo;
@@ -24,6 +25,9 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
     @Autowired
     private BaseLocationInfoMapper baseLocationInfoMapper;
 
+    @Value("${in_id}")
+    private int in_id;
+
     /**
      * 查询库位信息
      * 
@@ -45,7 +49,9 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
     @Override
     public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo)
     {
-        return baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo);
+//        List<BaseLocationInfo> baseLocationInfos = baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo);
+        List<BaseLocationInfo> baseLocationInfos = baseLocationInfoMapper.selectBaseLocationInfoListNew(in_id,baseLocationInfo.getStoreCode());
+        return baseLocationInfos;
     }
 
     /**
@@ -57,7 +63,7 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
     @Override
     @DataSource(value = DataSourceType.SLAVE)
     public List<OrderInfo> getPlanInfo(){
-        return baseLocationInfoMapper.getPlanInfo(1);
+        return baseLocationInfoMapper.getPlanInfo(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 a467ea2..5afc5d7 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
@@ -112,7 +112,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
 
     @Override
     public List<OrderInfo> getClassTeamProInfo() {
-        return imosPrPlanMapper.getClassTeamProInfo();
+        return imosPrPlanMapper.getClassTeamProInfo(in_id);
     }
 
     @Override
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java
index 56c6ee2..a460d17 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java
@@ -57,6 +57,6 @@ public class KBAdsorbDeviceinfoServiceImpl implements IKBAdsorbDeviceinfoService
 
     @Override
     public String getAdsorbDeviceAlarmCount(){
-        return ScadaAbsorbMapper.selectScadaAdsorbDeviceAlarmCount();
+        return ScadaAbsorbMapper.selectScadaAdsorbDeviceAlarmCount(this.in_id);
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordOutstoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordOutstoreServiceImpl.java
index 87cf04d..925e083 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordOutstoreServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordOutstoreServiceImpl.java
@@ -7,6 +7,7 @@ import com.ruoyi.system.domain.RecordOutstore;
 import com.ruoyi.system.mapper.RecordOutstoreMapper;
 import com.ruoyi.system.service.IRecordOutstoreService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,6 +24,8 @@ public class RecordOutstoreServiceImpl implements IRecordOutstoreService
     @Autowired
     private RecordOutstoreMapper recordOutstoreMapper;
 
+    @Value("${in_id}")
+    private int in_id;
     /**
      * 查询出库记录
      * 
@@ -44,7 +47,9 @@ public class RecordOutstoreServiceImpl implements IRecordOutstoreService
     @Override
     public List<RecordOutstore> selectRecordOutstoreList(RecordOutstore recordOutstore)
     {
-        return recordOutstoreMapper.selectRecordOutstoreList(recordOutstore);
+//        List<RecordOutstore> recordOutstores = recordOutstoreMapper.selectRecordOutstoreList(recordOutstore);
+        List<RecordOutstore> recordOutstores = recordOutstoreMapper.selectRecordOutstoreListNew(in_id,recordOutstore.getStoreCode());
+        return recordOutstores;
     }
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
index 8a11f55..a516d80 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t1.delete_flag, t1.record_time
         from base_location_info t1
         left join IMOS_TE_BOM @SCADA_DBLINK t2 on t1.MATERIAL_TYPE = t2.DETIAL_MATERIAL_CODE
-        <where>  
+        <where>
             <if test="locationCode != null  and locationCode != ''"> and t1.location_code like concat(concat('%', #{locationCode}), '%')</if>
             <if test="locationName != null  and locationName != ''"> and t1.location_name like concat(concat('%', #{locationName}), '%')</if>
             <if test="materialType != null  and materialType != ''"> and t1.material_type = #{materialType}</if>
@@ -93,7 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBaseLocationInfoVo"/>
         where objid = #{objid}
     </select>
-        
+    <select id="selectBaseLocationInfoListNew"  resultMap="BaseLocationInfoResult">
+        SELECT * FROM TABLE (Base_Location_Info_List_OBJ_N(#{in_id},#{storeCode}))
+    </select>
+
     <insert id="insertBaseLocationInfo" parameterType="BaseLocationInfo">
         <selectKey keyProperty="objid" resultType="long" order="BEFORE">
             SELECT seq_base_location_info.NEXTVAL as objid FROM DUAL
diff --git a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
index 4273df1..db0deac 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
@@ -324,8 +324,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getClassTeamProInfo" resultType="OrderInfo" resultMap="OrderInfoResult">
+        SELECT * FROM TABLE ( Class_Team_Pro_Info_object_new(#{in_id}) )
     --         select * from table(scada_foam_proSum_query())
-    select sum(DAYORDER_QTY) as PLANNED_PRODUCTION,sum(ACTUAL_QTY) as ACTUAL_PRODUCTION  from view_scada1_list
+--     select sum(DAYORDER_QTY) as PLANNED_PRODUCTION,sum(ACTUAL_QTY) as ACTUAL_PRODUCTION  from view_scada1_list
     </select>
 
     <select id="getFoamerPlanInfo" parameterType='OrderInfo' resultMap="OrderInfoResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
index f9eef0d..d6c4259 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
@@ -55,7 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where objid = #{objid}
         <include refid="orderByRecordDate"/>
     </select>
-        
+    <select id="selectRecordOutstoreListNew" resultMap="RecordOutstoreResult">
+        SELECT * FROM TABLE (Record_Outstore_List_OBJ_N(#{in_id}, #{storeCode}))
+    </select>
+
     <insert id="insertRecordOutstore" parameterType="RecordOutstore">
         <!--<selectKey keyProperty="objid" resultType="long" order="BEFORE">
             SELECT seq_record_outstore.NEXTVAL as objid FROM DUAL
diff --git a/ruoyi-system/src/main/resources/mapper/system/ScadaAbsorbMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ScadaAbsorbMapper.xml
index 8953a12..76140f6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ScadaAbsorbMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ScadaAbsorbMapper.xml
@@ -36,8 +36,9 @@
     </select>
 
     <select id="selectScadaAdsorbDeviceAlarmCount" resultType="String">
-      select count(*) as count  from SCADA_DEVICE_ALARMINFO where DEVICEID = '1#'and BEGINTIME BETWEEN to_date( to_char( SYSDATE, 'yyyy-MM-dd' ) || '00:00:00', 'yyyy-MM-dd hh24:mi:ss' )
-        AND to_date( to_char( SYSDATE, 'yyyy-MM-dd' ) || '23:59:59', 'yyyy-MM-dd hh24:mi:ss' )
+        SELECT * FROM TABLE ( Adsorb_Device_Alarm_Count_NEW(#{in_id}) )
+--       select count(*) as count  from SCADA_DEVICE_ALARMINFO where DEVICEID = '1#'and BEGINTIME BETWEEN to_date( to_char( SYSDATE, 'yyyy-MM-dd' ) || '00:00:00', 'yyyy-MM-dd hh24:mi:ss' )
+--         AND to_date( to_char( SYSDATE, 'yyyy-MM-dd' ) || '23:59:59', 'yyyy-MM-dd hh24:mi:ss' )
     </select>
 
 
