UI-Project/src/views/Caching/cachingbefore.vue
@@ -37,7 +37,7 @@ } }); const toggleEnableState = async (row) => { const newState = row.enable_state === 1 ? 0 : 1; const newState = row.enable_state === 1 ? 0 : 1; // 发送请求到后端更新状态（这里省略了实际的请求逻辑） const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enablestate: newState }); if (response.code === 200) { UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -3,49 +3,55 @@ import {reactive} from "vue"; import {useRouter} from "vue-router" import request from "@/utils/request" // import { ref } from 'vue' import { ref, onMounted, onBeforeUnmount } from 'vue'; import { WebSocketHost ,host} from '@/utils/constants' import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; const dialogFormVisible = ref(true) const dialogFormVisiblea = ref(false) const dialogFormVisibleb = ref(false) const width = ref(); // 用于存储process_id的响应式引用 const height = ref(); // 用于存储process_id的响应式引用 const width = ref(); const height = ref(); const adjustedRects = ref([]); const adjustedRects2 = ref([]); const adjustedRectsa = ref([]); const adjustedRectsb = ref([]); // 进炉中 const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`; // 定义消息处理函数，更新 receivedData 变量 const handleMessage = (data) => { // 更新 tableData 的数据 // 进炉中 adjustedRects.value = data.intoGlass[0].map(rect => ({ ...rect, // 复制原始对象的其他属性 xcoordinate: rect.xCoordinate * 0.5, // 将x值除以3 ycoordinate: rect.ycoordinate * 0.5, width: rect.width * 0.4, height: rect.height * 0.4, ...rect, xcoordinate: rect.xCoordinate * 0.3, ycoordinate: rect.ycoordinate * 0.3, width: rect.width * 0.2, height: rect.height * 0.2, widtha: rect.width, heighta: rect.height, })); adjustedRects2.value = data.intoGlass2[0].map(rect => ({ ...rect, xcoordinate: rect.xCoordinate * 0.3, ycoordinate: rect.ycoordinate * 0.3, width: rect.width * 0.2, height: rect.height * 0.2, widtha: rect.width, heighta: rect.height, })); console.log(data.intoGlass[0]); // 进炉前 adjustedRectsa.value = data.waitingGlass[0].map(rect => ({ ...rect, // 复制原始对象的其他属性 xcoordinate: rect.xCoordinate * 0.5, // 将x值除以3 xcoordinate: rect.xCoordinate * 0.5, ycoordinate: rect.ycoordinate * 0.5, width: rect.width * 0.4, height: rect.height * 0.4, widtha: rect.width, heighta: rect.height, state: rect.state })); })); // 已出炉 adjustedRectsb.value = data.outGlass[0].map(rect => ({ ...rect, // 复制原始对象的其他属性 xcoordinate: rect.xCoordinate * 0.5, // 将x值除以3 xcoordinate: rect.xCoordinate * 0.5, ycoordinate: rect.ycoordinate * 0.5, width: rect.width * 0.4, height: rect.height * 0.4, @@ -55,18 +61,14 @@ })); }; onMounted(() => { // fetchFlowCardId(); // fetchTableData(); // 获取数据 initializeWebSocket(socketUrl, handleMessage); }); onBeforeUnmount(() => { console.log("关闭了") closeWebSocket(); }); </script> <template> <template> <div style="margin-top: 10px;"> <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">进炉中</el-button> <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;" >进炉前</el-button> @@ -75,20 +77,18 @@ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 700px;" v-loading="loading"> <div style="width: 49%;float: left;background-color: #f4f4f5;height: 650px;"> <el-scrollbar height="630px"> <div v-for="(group, groupId) in groupedRects" :key="groupId" style="position: relative;"> <div style="position: relative;width: 1400px;"> <div v-for="(rect, index) in adjustedRects" v-for="(rect, index) in adjustedRects" :key="index" class="rect" class="rect" :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`, width: `${rect.width}px`, height: `${rect.height}px` }" > <div class="centered-text"> <div >{{ rect.flowcardId }}</div> <div style="margin-top: 50px;margin-left: -50px;">{{ rect.widtha }}*{{ rect.heighta }}</div> </div> </div> </div> </div> </div> </el-scrollbar> </div> @@ -96,23 +96,23 @@ <el-scrollbar height="630px"> <div style="position: relative;width: 1400px;"> <div v-for="(rect, index) in adjustedRects" v-for="(rect, index) in adjustedRects2" :key="index" class="rect" class="rect" :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`, width: `${rect.width}px`, height: `${rect.height}px` }" > <div class="centered-text"> <div >{{ rect.flowcardId }}</div> <div style="margin-top: 50px;margin-left: -50px;">{{ rect.widtha }}*{{ rect.heighta }}</div> </div> </div> </div> </div> </el-scrollbar> </div> </el-card> </div> <div v-if="dialogFormVisiblea"> <!-- 进炉前 --> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> <el-scrollbar height="630px"> <div style="position: relative;width: 1400px;"> @@ -133,6 +133,7 @@ </el-card> </div> <div v-if="dialogFormVisibleb"> <!-- 已出炉 --> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> <el-scrollbar height="630px"> <div style="position: relative;width: 1400px;"> @@ -154,7 +155,6 @@ </div> </div> </template> <style scoped> #boxa{ border: 1px solid rgb(119, 116, 116); UI-Project/src/views/Returns/returns.vue
@@ -795,7 +795,7 @@ <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="数量：" :required="true" style="width: 14vw;"> <el-input v-model="number" autocomplete="off" /> <el-input placeholder="请输入数量" v-model="number" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> UI-Project/src/views/Slicecage/slicecage.vue
@@ -3,6 +3,7 @@ import {reactive} from "vue"; import {useRouter} from "vue-router" const router = useRouter() import request from "@/utils/request" import { WebSocketHost ,host} from '@/utils/constants' import { ref, onMounted , onBeforeUnmount} from "vue"; import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; @@ -17,8 +18,19 @@ const tableDatad = ref([]) const tableDatae = ref([]) const adjustedRects = ref([]); const height = ref([]); // const height = ref([]); const add = ref(false) const flowCardId = ref(''); const gap = ref(''); const glassId = ref(''); const glassType = ref(''); const height = ref(''); const sequence = ref(''); const state = ref(''); const temperingFeedSequence = ref(''); const temperingLayoutId = ref(''); const thickness = ref(''); const width = ref(''); const carposition1 = ref(60); const carposition2 = ref(220); const carposition3 = ref(60); @@ -49,30 +61,6 @@ const currentPage4 = ref(4) const pageSize4 = ref(100) const dialogForm = () => { ElMessageBox.confirm( '确定要急停吗?', '提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning', } ) .then(() => { ElMessage({ type: 'success', message: '急停成功！', }) }) .catch(() => { ElMessage({ type: 'info', message: '急停失败', }) }) } var timer=setInterval(() => { // console.log(million.value,million1.value); @@ -175,7 +163,7 @@ } }, 1000); const getTableRow = (row,type) =>{ switch (type) { case 'edit' :{ @@ -189,7 +177,90 @@ } } } const handleBindRack = (row) => { add.value = true; // 打开绑定架子对话框 }; // 添加 const handleConfirm = async () => { try { const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', { flowCardId: flowCardId.value, gap: gap.value, glassId: glassId.value, glassType: glassType.value, height: height.value, sequence: sequence.value, state: state.value, temperingFeedSequence: temperingFeedSequence.value, temperingLayoutId: temperingLayoutId.value, thickness: thickness.value, width: width.value, }); if (response.code == 200) { // 绑定成功，处理逻辑 ElMessage.success(response.message); add.value = false; tableData.value = response.data; } else { // 请求失败，显示错误消息 ElMessage.error(response.msg); } } catch (error) { // 处理错误 console.error(error); } }; // 是否禁用 const toggleEnableState = async (row) => { const newState = row.enableState === 1 ? 0 : 1; console.log(row.slot); console.log(row.enableState); var url="/cacheVerticalGlass/bigStorageCage/updateStorageCageDisabled?slot="+row.slot + "&enableState=" + newState; console.log(url); const response = await request.get(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.message); } row.enableState = newState; }; // const tableData = ref([ // // ...您的表格数据 // id: // deviceId slot enableState remainWidth // ]); // 删除 const opena = async(row) => { try { const confirmResult = await ElMessageBox.confirm( '是否删除该条信息?', '提示', { confirmButtonText: '是', cancelButtonText: '取消', type: 'warning', } ); if (confirmResult === 'confirm') { // 用户点击了“是”，现在调用删除接口 const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails", { menuId: row.id, }) if (response.code === 200) { ElMessage.success(response.message); } else { // 删除失败，您可以处理错误或显示错误信息给用户 ElMessage.error(response.msg); // alert('删除失败：' + deleteResponse.message); } } } catch (error) { // 处理可能出现的错误，比如 ElMessageBox 抛出的异常等 console.error('发生错误:', error); } }; const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`; // 定义消息处理函数，更新 receivedData 变量 @@ -278,13 +349,8 @@ <template> <div style="height: 700px;"> <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">手动进片</el-button> --> <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">理片笼信息</el-button> <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">出片队列</el-button> <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">终止进片</el-button> --> <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">终止出片</el-button> --> <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger" @click="dialogForm">软急停</el-button> --> <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading"> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;"> <el-table height="100%" ref="table" @@ -313,7 +379,7 @@ @selection-change="handleSelectionChange" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="bigStorageCageFeedTask.glassId" align="center" label="进片玻璃ID" min-width="80" /> <el-table-column prop="bigStorageCageFeedTask.tragetSlot" align="center" label="目标位置" min-width="120" /> <el-table-column prop="bigStorageCageFeedTask.targetSlot" align="center" label="目标位置" min-width="120" /> <!-- <el-table-column prop="task_type" align="center" label="任务类型" min-width="120" />没有返回字段 --> <el-table-column prop="bigStorageCageFeedTask.taskState" align="center" label="任务状态" min-width="120"> <template #default="scope"> @@ -398,152 +464,192 @@ <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;"> </div> --> </div> </div> <el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="请确认玻璃信息" > <div style="margin-left: 50px;margin-bottom: 10px;"> <div style="display: flex;"> <p style="margin-top: 4px;">确认状态:</p> <el-button style="margin-left: 10px;size: mini;" type="success">允许</el-button> <el-button style="margin-left: 10px;size: mini;" type="danger">不允许</el-button> <p style="margin-left: 60px;margin-top: 4px;">当前状态:</p> <div style="margin-top: 4px; margin-left: 10px;">手动</div> <el-button style="margin-left: 10px;size: mini;" type="primary">切换</el-button> <el-input placeholder="请输入玻璃id" style="width: 180px;size: mini;margin-left: 60px;"></el-input> <el-button style="margin-left: 10px;size: mini;" type="primary">添加</el-button> <p style="margin-left: 60px;margin-top: 4px;">玻璃id:</p> <el-input style="width: 180px;size: mini;margin-left: 30px;"></el-input> </div> <div style="display: flex;"> <p style="margin-left: 290px;margin-top: 20px;font-weight: bold;">上片位</p> <p style="margin-left: 630px;margin-top: 20px;font-weight: bold;">扫码位</p> </div> <div style="display: flex;"> <div style="margin-top: 20px;"> <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">当前信息</p> <el-form label-position="right" label-width="90px"> <el-form-item style="width: 20vw" label="玻璃id："> <el-input style="width: 180px" size="mini" placeholder="请输入玻璃id"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="订单编号："> <el-input style="width: 180px" size="mini" placeholder="请输入订单编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="列表编号："> <el-input style="width: 180px" size="mini" placeholder="请输入列表编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="箱子编号："> <el-input style="width: 180px" size="mini" placeholder="请输入箱子编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="长："> <el-input style="width: 180px" size="mini" placeholder="请输入长"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="宽："> <el-input style="width: 180px" size="mini" placeholder="请输入宽"></el-input> </el-form-item> </el-form> <el-dialog v-model="add" top="20vh" width="60%" title="添加理片笼信息" > <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;"> <el-form size="mini" label-width="150px"> <el-form label-width="150px" label-position="right"> <el-row style="margin-top: -15px;margin-bottom: -2px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="玻璃ID：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入玻璃ID" v-model="glassId" autocomplete="off" /> </el-form-item> </div></div> </el-col> <el-col :span="9"> <div id="dta" style="font-size: 15px;"> <div> <el-form-item label="小片在格内的顺序：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入小片在格内的顺序" v-model="sequence" autocomplete="off" /> </el-form-item></div> </div> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="流程卡号：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入流程卡号" v-model="flowCardId" autocomplete="off" /> </el-form-item></div></div> </el-col> <el-col :span="9"> <div id="dta" style="font-size: 15px;"> <div> <el-form-item label="玻璃类型：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入玻璃类型" v-model="glassType" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="宽：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入宽" v-model="width" autocomplete="off" /> </el-form-item></div></div> </el-col> <el-col :span="9"> <div id="dta" style="font-size: 15px;"> <div> <el-form-item label="高：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入高" v-model="height" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="厚度：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入厚度" v-model="thickness" autocomplete="off" /> </el-form-item></div></div> </el-col> <el-col :span="9"> <div id="dta" style="font-size: 15px;"> <div> <el-form-item label="钢化版图ID：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入钢化版图ID" v-model="temperingLayoutId" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="钢化版图片序：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入钢化版图片序" v-model="temperingFeedSequence" autocomplete="off" /> </el-form-item></div></div> </el-col> <el-col :span="9"> <div id="dta" style="font-size: 15px;"> <div> <el-form-item label="启用状态：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入启用状态" v-model="state" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="玻璃间隙：" :required="true" style="width: 20vw;"> <el-input placeholder="请输入玻璃间隙" v-model="gap" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> </el-form> </el-form> </div> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="handleConfirm"> 确认 </el-button> <el-button @click="add = false">取消</el-button> </div> <div style="margin-top: 20px;"> <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">修改信息</p> <el-form label-position="right" label-width="90px"> <el-form-item style="width: 20vw" label="玻璃id："> <el-input style="width: 180px" size="mini" placeholder="请输入玻璃id"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="订单编号："> <el-input style="width: 180px" size="mini" placeholder="请输入订单编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="列表编号："> <el-input style="width: 180px" size="mini" placeholder="请输入列表编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="箱子编号："> <el-input style="width: 180px" size="mini" placeholder="请输入箱子编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="长："> <el-input style="width: 180px" size="mini" placeholder="请输入长"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="宽："> <el-input style="width: 180px" size="mini" placeholder="请输入宽"></el-input> </el-form-item> </el-form> </div> <div style="margin-top: 20px;"> <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">修改信息</p> <el-form label-position="right" label-width="90px"> <el-form-item style="width: 20vw" label="玻璃id："> <el-input style="width: 180px" size="mini" placeholder="请输入玻璃id"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="订单编号："> <el-input style="width: 180px" size="mini" placeholder="请输入订单编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="列表编号："> <el-input style="width: 180px" size="mini" placeholder="请输入列表编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="箱子编号："> <el-input style="width: 180px" size="mini" placeholder="请输入箱子编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="长："> <el-input style="width: 180px" size="mini" placeholder="请输入长"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="宽："> <el-input style="width: 180px" size="mini" placeholder="请输入宽"></el-input> </el-form-item> </el-form> </div> <div style="margin-top: 20px;"> <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">当前信息</p> <el-form label-position="right" label-width="90px"> <el-form-item style="width: 20vw" label="玻璃id："> <el-input style="width: 180px" size="mini" placeholder="请输入玻璃id"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="订单编号："> <el-input style="width: 180px" size="mini" placeholder="请输入订单编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="列表编号："> <el-input style="width: 180px" size="mini" placeholder="请输入列表编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="箱子编号："> <el-input style="width: 180px" size="mini" placeholder="请输入箱子编号"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="长："> <el-input style="width: 180px" size="mini" placeholder="请输入长"></el-input> </el-form-item> <el-form-item style="width: 20vw" label="宽："> <el-input style="width: 180px" size="mini" placeholder="请输入宽"></el-input> </el-form-item> </el-form> </div> </div> </div> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="dialogFormVisible = false"> 确认 </el-button> <el-button @click="dialogFormVisible = false">取消</el-button> </div> </template> </el-dialog> <el-dialog v-model="dialogFormVisiblea" top="10vh" width="85%" title="理片笼信息" > <!-- <el-input placeholder="请输入工程号" style="width: 180px;size: mini;"></el-input> --> <!-- <el-button style="margin-left: 10px;size: mini;" type="primary">查询</el-button> --> <el-table ref="table" style="margin-top: 20px;height: 500px;" @selection-change="handleSelectionChange" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="id" align="center" label="大理片笼表ID" min-width="80" /> <el-table-column prop="deviceId" align="center" label="理片笼号" min-width="120" /> <el-table-column prop="slot" align="center" label="栅格号" min-width="120" /> </template> </el-dialog> <el-dialog v-model="dialogFormVisiblea" top="5vh" width="90%" title="理片笼信息" > <el-table :data="tableData" height="600" @expand-change="handleExpandChange" row-key="id" default-expand-all :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" > <el-table-column type="expand"> <template #default="props"> <div v-if="props.row.bigStorageCageDetails && props.row.bigStorageCageDetails.length"> <el-table :data="props.row.bigStorageCageDetails" border style="width: 100%;margin-left: 20px;" row-key="id" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" > <!-- <el-table-column prop="menuName" label="二级菜单栏" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> --> <el-table-column prop="glassId" label="玻璃ID" align="center" min-width="100"/> <el-table-column prop="sequence" align="center" label="小片在格内的顺序" min-width="120" /> <el-table-column prop="flowCardId" align="center" label="流程卡号" min-width="120" /> <el-table-column prop="glassType" align="center" label="玻璃类型" min-width="100" /> <el-table-column prop="width" align="center" label="宽" min-width="80" /> <el-table-column prop="height" align="center" label="高" min-width="80" /> <el-table-column prop="thickness" align="center" label="厚度" min-width="80" /> <el-table-column prop="temperingLayoutId" align="center" label="钢化版图ID" min-width="100" /> <el-table-column prop="temperingFeedSequence" align="center" label="钢化版图片序" min-width="120" /> <el-table-column align="center" label="启用状态" min-width="80" prop="state" > <template #default="scope"> <el-tag :type="getStatusType(scope.row.state)"> {{ getStatusText(scope.row.state) }} </el-tag> </template> </el-table-column> <el-table-column prop="gap" align="center" label="玻璃间隙" min-width="80" /> <el-table-column fixed="right" label="操作" align="center" min-width="180"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">破损</el-button> <el-button size="mini" type="text" plain @click="opena(scope.row)">删除</el-button> <el-button size="mini" type="text" plain @click="opena(scope.row)">出片</el-button> </template> </el-table-column> </el-table> </div> </template> </el-table-column> <el-table-column prop="id" label="大理片笼表ID" align="center" min-width="100"/> <el-table-column prop="deviceId" align="center" label="理片笼号" min-width="150" /> <el-table-column prop="slot" align="center" label="栅格号" min-width="150" /> <el-table-column align="center" label="启用状态" min-width="80" prop="enableState" > <template #default="scope"> <el-tag :type="getStatusType(scope.row.enableState)"> {{ getStatusText(scope.row.enableState) }} </el-tag> </template> <el-tag :type="scope.row.enableState === 1 ? 'success' : 'danger'" @click="toggleEnableState(scope.row)" > {{ scope.row.enableState === 1 ? '启用' : '禁用' }} </el-tag> </template> </el-table-column> <el-table-column prop="remainWidth" align="center" label="剩余宽度" min-width="120" /> <el-table-column fixed="right" label="操作" align="center"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">添加</el-button> </template> </el-table-column> </el-table> <div id="demo-pagination-block"> <el-pagination @@ -562,23 +668,21 @@ </div> </el-dialog> <el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="出片队列" > <div style="display: flex;"> <!-- <div style="display: flex;"> <p style="margin-top: 3px;">队列状态：</p> <p style="margin-top: 3px;">开始</p> <el-button style="margin-left: 10px;size: mini;" type="danger">停止</el-button> <el-button style="margin-left: 10px;size: mini;" type="primary">添加</el-button> </div> </div> --> <el-table ref="table" style="margin-top: 20px;height: 500px;" :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="id" fixed align="center" label="钢化小片信息表id" min-width="150"/> <!-- <el-table-column prop="glass_id" align="center" label="玻璃id" min-width="120" /> --> <el-table-column prop="flowcardId" fixed align="center" label="流程卡" min-width="120" /> <el-table-column prop="glassType" align="center" label="流程卡玻璃类型" min-width="150" /> <el-table-column prop="width" align="center" label="宽" min-width="80" /> <el-table-column prop="height" align="center" label="高" min-width="80" /> <el-table-column prop="thickness" align="center" label="厚度" min-width="80" /> <el-table-column prop="filmsid" align="center" label="膜系" min-width="80" /> <!-- <el-table-column prop="ishorizontal" align="center" label="钢化是否接受横放" min-width="150" /> --> <el-table-column align="center" label="钢化是否接受横放" @@ -596,7 +700,6 @@ <el-table-column prop="xCoordinate" align="center" label="x坐标" min-width="80" /> <el-table-column prop="yCoordinate" align="center" label="y坐标" min-width="80" /> <el-table-column prop="angle" align="center" label="旋转角度（逆时针）" min-width="150" /> <!-- <el-table-column prop="state" align="center" label="状态" min-width="80" /> --> <el-table-column align="center" label="状态" @@ -611,7 +714,7 @@ </el-table-column> <el-table-column fixed="right" label="操作" align="center" width="150"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">添加</el-button> <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">破损</el-button> <el-button size="mini" type="text" plain @click="handleBindRacka(scope.row)">删除</el-button> </template> </el-table-column> UI-Project/src/views/User/permissions.vue
@@ -97,7 +97,6 @@ parentId: parentId.value, url: url.value, }); if (response.code == 200) { // 绑定成功，处理逻辑 ElMessage.success(response.message); @@ -117,7 +116,7 @@ const opena = async(row) => { try { const confirmResult = await ElMessageBox.confirm( '是否删除该用户?', '是否删除该菜单?', '提示', { confirmButtonText: '是', @@ -228,26 +227,7 @@ <el-button size="mini" type="text" plain @click="opena(scope.row)">删除</el-button> </template> </el-table-column> </el-table> <!-- <el-table height="240" ref="table" @selection-change="handleSelectionChange" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="menuName" align="center" label="菜单栏" min-width="180" /> <el-table-column align="center" label="链接" min-width="180"> <template #default="scope"> <el-tag v-for="role in scope.row.children"> {{role.url}} </el-tag> </template> </el-table-column> <el-table-column prop="id" align="center" label="排序" min-width="180" /> <el-table-column fixed="right" label="操作" align="center" width="200"> <template #default="scope"> <el-button size="mini" type="text" plain @click="adda = true">编辑</el-button> <el-button size="mini" type="text" plain @click="opena(scope.row)">删除</el-button> </template> </el-table-column> </el-table> --> </el-table> </div> </el-card> </div> UI-Project/src/views/User/rolelist.vue
@@ -105,7 +105,7 @@ const opena = async(row) => { try { const confirmResult = await ElMessageBox.confirm( '是否删除该用户?', '是否删除该角色?', '提示', { confirmButtonText: '是', @@ -200,7 +200,7 @@ <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="角色：" :required="true" style="width: 25vw"> <el-input v-model="name" autocomplete="off" /> <el-input placeholder="请输入角色" v-model="name" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> @@ -225,7 +225,7 @@ <div id="dt" style="font-size: 15px;"> <div> <el-form-item label="角色：" :required="true" style="width: 25vw"> <el-input v-model="editingUser.name" autocomplete="off" /> <el-input placeholder="请输入角色" v-model="editingUser.name" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -28,11 +28,13 @@ * 卧式理片笼详情表玻璃状态 * 识别后成功状态100 * 出片任务101 * 人工下片101 * 拿走200 * 破损201 */ public static final Integer GLASS_STATE_IN = 100; public static final Integer GLASS_STATE_OUT = 101; public static final Integer GLASS_STATE_ARTIFICIAL = 102; public static final Integer GLASS_STATE_TAKE = 200; public static final Integer GLASS_STATE_DAMAGE = 201;
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.mes.damage.service.impl; import com.mes.damage.entity.Damage; import com.mes.damage.mapper.DamageMapper; import com.mes.damage.service.DamageService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author wu * @since 2024-06-13 */ @Service public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService { } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
@@ -29,7 +29,7 @@ private Long id; /** * 设备id * 工程id */ private String engineerId;
@@ -29,8 +29,8 @@ /** * 大理片笼表id */ @ApiModelProperty(value = "大理片笼表id", position = 2) @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "大理片笼表id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Integer id; /** hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -6,13 +6,11 @@ import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; import com.mes.bigstoragetask.entity.BigStorageCageOutTask; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.List; /** * <p> @@ -22,7 +20,6 @@ * @author zhoush * @since 2024-03-27 */ @ApiModel(description = "<p> </p>") @Api(description = "大理片笼详情") @Data @EqualsAndHashCode(callSuper = false) @@ -116,6 +113,12 @@ private Integer gap; /** * 工程号 */ @ApiModelProperty(value = "工程号") private String engineerId; /** * 进片任务 */ @ApiModelProperty(value = "进片任务", position = 16) hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/SlotSequenceDTO.java
New file @@ -0,0 +1,38 @@ package com.mes.bigstorage.entity.dto; import lombok.Data; /** * @Author : zhoush * @Date: 2024/6/13 15:51 * @Description: */ @Data public class SlotSequenceDTO { /** * 钢化版图id */ private String engineerId; /** * 钢化版图id */ private Integer temperingLayoutId; /** * 大理片详情中格子号 */ private Integer slot; /** * 格子内的最大序号 */ private Integer maxSequence; /** * 格子内的最小序号 */ private Integer minSequence; /** * 格子剩余宽度 */ private Integer remainWidth; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/TemperingLayoutDTO.java
New file @@ -0,0 +1,30 @@ package com.mes.bigstorage.entity.dto; import lombok.Data; /** * @Author : zhoush * @Date: 2024/6/13 15:51 * @Description: */ @Data public class TemperingLayoutDTO { /** * 钢化版图id */ private String engineerId; /** * 钢化版图id */ private Integer temperingLayoutId; /** * 当前版图数量 */ private Integer count; /** * 当前版图占用格子数量 */ private Integer slotCount; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -1,9 +1,12 @@ package com.mes.bigstorage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.mes.bigstorage.entity.BigStorageCageDetails; import feign.Param; import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import org.apache.ibatis.annotations.Param; import java.util.List; /** @@ -16,4 +19,20 @@ */ public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> { /** * 获取钢化版图已经到齐的工程号及版图id * * @return */ TemperingLayoutDTO temperingIsAll(); /** * 获取每个钢化版图占用的格子数量 * * @return */ TemperingLayoutDTO queryTemperingOccupySlot(@Param(value = "count") int count); List<SlotSequenceDTO> queryGlassMaxAndMin(@Param(value = "engineerId") String engineerId, @Param(value = "temperingLayoutId") Integer temperingLayoutId); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.BigStorageDTO; import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; @@ -39,4 +41,27 @@ * @param glassInfo */ BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo); /** * 获取钢化版图已经到齐的工程号及版图id * * @return */ TemperingLayoutDTO temperingIsAll(); /** * 获取每个钢化版图占用的格子数量 * * @return */ TemperingLayoutDTO queryTemperingOccupySlot(); /** * 获取版图每个格子的最大最小序号 * * @param engineerId * @param temperingLayoutId * @return */ List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -7,6 +7,8 @@ import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.BigStorageDTO; import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; @@ -20,6 +22,7 @@ import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,6 +51,9 @@ private BigStorageCageService bigStorageCageService; @Resource private GlassInfoMapper glassInfoMapper; @Value("${mes.minCount}") private int minCount; /** * 查询进/出片任务 @@ -214,19 +220,17 @@ @Override public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) { // MPJLambdaWrapper<BigStorageDTO> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class) // .selectAll(BigStorageDTO.class) // .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot) // .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) // .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1) // .last("limit 1"); BigStorageDTO bigStorageDTO = null; MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class) .selectAsClass(BigStorageCage.class, BigStorageDTO.class) .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot) .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1) .last("limit 1"); if (glassInfo.getTemperingLayoutId() == 0) { wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight()); } else { wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1); } bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper); if (null != bigStorageDTO) { return bigStorageDTO; @@ -253,4 +257,20 @@ } @Override public TemperingLayoutDTO temperingIsAll() { return baseMapper.temperingIsAll(); } @Override public TemperingLayoutDTO queryTemperingOccupySlot() { return baseMapper.queryTemperingOccupySlot(minCount); } @Override public List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId) { return baseMapper.queryGlassMaxAndMin(engineerId, temperingLayoutId); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java
@@ -2,16 +2,16 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * * * </p> * * @author zhoush @@ -24,11 +24,23 @@ private static final long serialVersionUID = 1L; public BigStorageCageOutTask() { } public BigStorageCageOutTask(String glassId, Integer startSlot, Integer endSlot, Integer trainNumber, Integer serialNumber, Integer taskState) { this.glassId = glassId; this.startSlot = startSlot; this.endSlot = endSlot; this.trainNumber = trainNumber; this.serialNumber = serialNumber; this.taskState = taskState; } /** * 主键id */ @ApiModelProperty(value = "主键id", position = 2) @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "主键id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -66,6 +78,5 @@ */ @ApiModelProperty(value = "任务状态", position = 8) private Integer taskState; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -3,11 +3,14 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.BigStorageDTO; import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; import com.mes.bigstoragetask.entity.BigStorageCageOutTask; import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService; import com.mes.bigstoragetask.service.BigStorageCageOutTaskService; import com.mes.common.S7object; @@ -17,6 +20,7 @@ import com.mes.edgglasstask.service.EdgGlassTaskInfoService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingGlassInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -24,15 +28,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -42,8 +43,6 @@ @Slf4j public class PlcStorageCageTask { @Resource private BigStorageCageService bigStorageCageService; @Resource private BigStorageCageDetailsService bigStorageCageDetailsService; @Resource @@ -57,148 +56,45 @@ @Resource private TemperingGlassInfoService temperingGlassInfoService; private static final String REQUEST_WORD = "1"; @Value("${mes.sequence.order}") private boolean sequenceOrder; public static boolean bigStorageCageFullAlarm = false; @Value("${mes.slotWidth}") private Integer slotWidth; private int line1Time = 0; private int line2Time = 0; /** * fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成） * fixedDelay : 上一个调用结束后再次调用的延时 */ // @Scheduled(fixedDelay = 5000) // public void plcStorageCageTask() throws InterruptedException { // // PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject; // try { // // String plcFeedGlassid = ""; // String plcFeedReqLine = "0"; // if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) { // plcFeedReqLine = "1"; // plcFeedGlassid = plcParameterObject.getPlcParameter("D01ID1").getValue(); // } // if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) { // plcFeedReqLine = "2"; // plcFeedGlassid = plcParameterObject.getPlcParameter("D04ID1").getValue(); // } // line1Time += 1; // line2Time += 1; // // if (!("0".equals(plcFeedReqLine))) { // log.info("1、Plc进片请求时"); // BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails(); // GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid); // log.info("2、根据玻璃id获取玻璃信息" + glassInfo); // if (bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine) >= 0) { // BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails); // if (slotInfo != null) { // int taskType = edgGlassTaskInfoService.judgeTasktype(plcFeedReqLine); // log.info("3、查询任务表判断当前任务类型为上车等到还是上车启动" + taskType); // bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType); // log.info("4、添加任务到任务表"); // bigStorageCageFullAlarm = false; // } else { // bigStorageCageFullAlarm = true; // } // } else { // log.info("当前玻璃宽度不够上车" + glassInfo); // if (!("1".equals(plcFeedReqLine))) { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1); // } else { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1); // } // } // } else { // List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1); // log.info("5、查询任务表是否有已经完成的进片任务" + bigStorageCageFeedTaskList.size()); // for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskList // ) { // BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails(); // bigStorageCageDetails.setId(bigStorageCageFeedTask.getId()); // bigStorageCageDetails.setState(1); // bigStorageCageDetailsService.updateById(bigStorageCageDetails); // log.info("6、修改理片笼详情玻璃状态"); // bigStorageCageFeedTaskService.removeById(bigStorageCageFeedTask); // log.info("7、删除已经完成的进片任务"); // } // //启动阈值 // if (line1Time >= 300) { // if ("0".equals(plcParameterObject.getPlcParameter("D05Go").getValue())) { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1); // } // } // if (line2Time >= 300) { // if ("0".equals(plcParameterObject.getPlcParameter("D02Go").getValue())) { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1); // } // } // } // // //查询出片表是否有任务未完成的任务 // List<BigStorageCageOutTask> bigStorageCageOutTask = bigStorageCageOutTaskService.querybigStorageCageOutTask(0); // if (bigStorageCageOutTask.size() == 0) { // boolean result = bigStorageCageService.outGlass(); // log.info("8、没有未完成任务时调用出片接口"); // if (result == false) { // temperingGlassInfoService.schedulingTask(); // } // } // bigStorageCageOutTaskService.updateOutTask(); // log.info("9、根据任务表状态修改钢化小片表任务状态"); // // //来不及送时直接走 // String line = Integer.toString(edgGlassTaskInfoService.startTask()); // // if (!(line.equals(plcFeedReqLine))) { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1); // } else { // S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1); // } // // // } catch (Exception e) { // e.printStackTrace(); // } // } @Scheduled(fixedDelay = 5000) public void plcToHomeEdgScan() { PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject; String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue(); String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue(); String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue(); String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue(); String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue(); String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue(); log.info("1、获取到的请求字d01为：{}，获取到的扫描ID为：{};获取到的请求字d04为：{}，获取到的扫描ID为：{};", d01Request, d01ID1, d04Request, d04ID1); if (!"1".equals(d01Request) && !"1".equals(d04Request)) { d01Request, d01Id, d04Request, d04Id); if (!REQUEST_WORD.equals(d01Request) && !REQUEST_WORD.equals(d04Request)) { log.info("两条线未收到进片任务，结束本次扫描进卧转立任务"); return; } // 0：不干预 ； 1：条件满足情况下立即发车 String d02GoAdress = plcParameterObject.getPlcParameter("D02Go").getAddress(); // 0：不干预 ； 1：条件满足情况下立即发车 String d05GoAdress = plcParameterObject.getPlcParameter("D05Go").getAddress(); Boolean flag01 = Boolean.FALSE; Boolean flag04 = Boolean.FALSE; //按照线路及玻璃id获取相邻两块玻璃 卧转立上的玻璃 if ("1".equals(d01Request)) { flag01 = judgeGlassTypeStatus(d01ID1, Const.A09_OUT_TARGET_POSITION); if (REQUEST_WORD.equals(d01Request)) { flag01 = judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION); } if ("1".equals(d04Request)) { flag04 = judgeGlassTypeStatus(d04ID1, Const.A10_OUT_TARGET_POSITION); if (REQUEST_WORD.equals(d04Request)) { flag04 = judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION); } if (flag01 && flag04) { //比较最早一片任务的版图id及版序 求出卧转立的线路 Integer startLine = getStartLine(); //计算目标格子，发送启动任务 computeTargetByLine(startLine, d02GoAdress, d05GoAdress); computeTargetByLine(startLine); } else if (flag01 || flag04) { Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION; //计算目标格子，发送启动任务 computeTargetByLine(startLine, d02GoAdress, d05GoAdress); computeTargetByLine(startLine); } else { log.info("两条线未收到进片任务，结束本次扫描进卧转立任务"); } @@ -208,21 +104,21 @@ public void plcToHomeEdgFreeCarTask() { PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject; String freeCar = plcParameterObject.getPlcParameter("freeCar").getValue(); if ("1".equals(freeCar)) { if (REQUEST_WORD.equals(freeCar)) { log.info("大车非空闲"); return; } String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue(); String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue(); String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue(); String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue(); String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue(); String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue(); log.info("1、获取到的请求字d01为：{}，获取到的扫描ID为：{};获取到的请求字d04为：{}，获取到的扫描ID为：{};", d01Request, d01ID1, d04Request, d04ID1); d01Request, d01Id, d04Request, d04Id); //两条线都有进卧转立任务，直接结束 if (Const.BIG_STORAGE_REQUEST_IN.equals(d01Request) && Const.BIG_STORAGE_REQUEST_IN.equals(d04Request) && StringUtils.isNotBlank(d01ID1) && StringUtils.isNotBlank(d04ID1)) { && StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) { log.info("两条线都存在进片任务，结束任务"); return; } @@ -232,35 +128,111 @@ log.info("两条线卧转立为空或者有进片任务未完成，结束任务"); return; } // 0：不干预 ； 1：条件满足情况下立即发车 String d02GoAdress = plcParameterObject.getPlcParameter("D02Go").getAddress(); // 0：不干预 ； 1：条件满足情况下立即发车 String d05GoAdress = plcParameterObject.getPlcParameter("D05Go").getAddress(); String line1 = lineList.get(0); String flagLine = line1.equals(Const.A09_OUT_TARGET_POSITION) ? d01ID1 : d04ID1; String flagLine = line1.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d04Id; if (lineList.size() == 1) { //发送 if (StringUtils.isNotBlank(flagLine)) { return; } //计算任务表进片格子 发送进片任务 computeTargetByLine(Integer.parseInt(flagLine), d02GoAdress, d05GoAdress); computeTargetByLine(Integer.parseInt(flagLine)); return; } if (StringUtils.isBlank(d01ID1) && StringUtils.isBlank(d04ID1)) { if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) { //比较最早一片任务的版图id及版序 求出卧转立的线路 Integer line = getStartLine(); //计算任务表进片格子 发送进片任务 computeTargetByLine(line, d02GoAdress, d05GoAdress); computeTargetByLine(line); return; } int outLine = StringUtils.isBlank(d01ID1) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION; int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION; //计算任务表进片格子 发送进片任务 computeTargetByLine(outLine, d02GoAdress, d05GoAdress); computeTargetByLine(outLine); } @Scheduled(fixedDelay = 5000) public void plcToHomeEdgOutTask() { //任务数据 获取车子存放玻璃最大数量 玻璃间隔 List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>(); //是否有正在钢化的玻璃 List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>() .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW) .orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence)); if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) { log.info("有正在出片的钢化任务"); //打车剩余尺寸 Integer remainWidth = Const.BIG_STORAGE_WIDTH; for (TemperingGlassInfo e : temperingGlassInfoList) { if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) { break; } remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP; bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION, 0, 0, 1)); } bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList); return; } //todo:是否有人工下片任务 有直接出 //笼内是否有人工下片玻璃 无 结束 List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth)); if (CollectionUtils.isEmpty(artificialList)) { Integer remainWidth = Const.BIG_STORAGE_WIDTH; for (BigStorageCageDetails e : artificialList) { if (remainWidth < e.getWidth().intValue()) { break; } bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), 0, 0, 0, 1)); remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP; } bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList); return; } //钢化优先：获取理片笼 玻璃小片 破损表 数量 判断笼内版图是否到齐 TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll(); if (null != temperingLayoutDTO) { //玻璃到齐 //到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务 结束 List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId()) .eq(BigStorageCageDetails::getEngineerId, temperingLayoutDTO.getEngineerId())); List<TemperingGlassInfo> temperingGlassInfos = bigStorageCageDetails.stream().map(e -> { TemperingGlassInfo info = new TemperingGlassInfo(); BeanUtils.copyProperties(e, info); return info; }).collect(Collectors.toList()); temperingGlassInfoService.saveBatch(temperingGlassInfos); //大车剩余尺寸 Integer remainWidth = Const.BIG_STORAGE_WIDTH; for (TemperingGlassInfo e : temperingGlassInfoList) { if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) { break; } remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP; bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION, 0, 0, 1)); } bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList); return; } //未到齐 执行内部调度任务 TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot(); if (null != temperingOccupySlot) { List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId()); for (int i = 0; i < slotSequenceList.size() - 1; i++) { SlotSequenceDTO first = slotSequenceList.get(i); SlotSequenceDTO second = slotSequenceList.get(i + 1); if (first.getMinSequence() == second.getMaxSequence() + 1 && second.getRemainWidth() > Const.BIG_STORAGE_WIDTH - first.getRemainWidth() - Const.BIG_STORAGE_GAP) { List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)); List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(), 0, 0, 1)).collect(Collectors.toList()); bigStorageCageOutTaskService.saveBatch(outTasks); return; } } } } @@ -276,32 +248,29 @@ Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败"); //2、获取卧转立剩余宽度 Map<String, Object> map = bigStorageCageFeedTaskService.getMap(new QueryWrapper<BigStorageCageFeedTask>() .select("cast(5000 - sum(width + 20) as INT)as remainWidth") .select("cast(" + Const.BIG_STORAGE_WIDTH + " - sum(width + " + Const.BIG_STORAGE_GAP + ") as INT) as remainWidth") .eq("line", line).eq("task_state", Const.BIG_STORAGE_IN_UP)); Integer remainWidth = null == map ? 5000 : Integer.parseInt(map.get("remainWidth") + ""); Integer remainWidth = null == map ? Const.BIG_STORAGE_WIDTH : Integer.parseInt(map.get("remainWidth") + ""); //2、获取卧转立 Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth(); if (edgGlassTaskInfoList.size() == 1) { if (remainWidth >= widthFirst) { addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst); return Boolean.FALSE; } else { //记录无法放下玻璃，后续判断启动 return Boolean.TRUE; } } Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth(); if (remainWidth >= widthFirst) { if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) { addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthSecond); } else { addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthSecond); } return Boolean.FALSE; } else { return Boolean.TRUE; Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth(); if (remainWidth >= widthFirst) { if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) { addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthSecond); return Boolean.FALSE; } else { addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthSecond); } } } //记录无法放下玻璃，后续判断启动 return Boolean.TRUE; } /** @@ -321,7 +290,7 @@ /** * 获取需要启动的线路：两条线都可启动 获取第一片玻璃版图id最小 版序最大的线路 * * @return * @return 需要启动的线路 */ public Integer getStartLine() { List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>() @@ -340,7 +309,7 @@ /** * 计算任务表进片线路的目标格子，并启动任务 */ public boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) { public boolean computeTargetByLine(Integer line) { //1、获取任务表中的所有玻璃（指定线路且已经进卧转立完成） List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>() .eq(BigStorageCageFeedTask::getLine, line) @@ -349,43 +318,67 @@ //2、去笼子内查找是否可以继续存放的笼子 List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList()); List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds)); AtomicReference<Integer> temperingLayoutIdTemp = new AtomicReference<>(0); AtomicReference<Integer> temperingFeedSequenceTemp = new AtomicReference<>(0); AtomicReference<BigStorageDTO> bigStorageDTO = new AtomicReference<>(new BigStorageDTO()); Map<String, GlassInfo> glassInfoMap = glassInfos.stream().collect(Collectors.toMap(GlassInfo::getGlassId, p -> p)); List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>(); AtomicBoolean taskFlag = new AtomicBoolean(Boolean.TRUE); taskList.stream().forEach(e -> { BigStorageCageDetails cageDetails = new BigStorageCageDetails(); //按照版图信息获取进片笼子格子号 List<BigStorageCageDetails> temperingList = computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.TRUE); List<BigStorageCageDetails> noTemperingList = computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.FALSE); bigStorageCageDetailsList.addAll(temperingList); bigStorageCageDetailsList.addAll(noTemperingList); //4、在详情表中加入进片玻璃信息 bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList); return Boolean.TRUE; } /** * 是否钢化玻璃进笼目标位置 * * @param glassInfos 当条线卧转立所有玻璃 * @param taskList 当条线卧转立所有任务 * @param isTempering true 钢化 false 不钢化 */ private List<BigStorageCageDetails> computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList, Boolean isTempering) { Map<String, GlassInfo> glassInfoMap; if (isTempering) { glassInfoMap = glassInfos.stream().filter(e -> e.getTemperingLayoutId() != 0) .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p)); } else { glassInfoMap = glassInfos.stream().filter(e -> e.getTemperingLayoutId() == 0) .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p)); } //设置临时变量接受版图id，版序、格子号及剩余宽度 Integer temperingLayoutIdTemp = 0; Integer temperingFeedSequenceTemp = 0; BigStorageDTO bigStorageDTO = new BigStorageDTO(); List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>(); for (BigStorageCageFeedTask e : taskList) { GlassInfo info = glassInfoMap.get(e.getGlassId()); if (info == null) { continue; } BigStorageCageDetails cageDetails = new BigStorageCageDetails(); BeanUtils.copyProperties(info, cageDetails); if (temperingLayoutIdTemp.equals(info.getTemperingLayoutId()) && temperingFeedSequenceTemp.equals(info.getTemperingFeedSequence() + 1) && info.getWidth() <= bigStorageDTO.get().getWidth()) { bigStorageDTO.get().setWidth(bigStorageDTO.get().getWidth() - info.getWidth().intValue() - Const.BIG_STORAGE_GAP); && info.getWidth() <= bigStorageDTO.getWidth()) { bigStorageDTO.setWidth(bigStorageDTO.getWidth() - info.getWidth().intValue() - Const.BIG_STORAGE_GAP); } else { bigStorageDTO.set(bigStorageCageDetailsService.queryTargetSlotByTempering(info)); bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info); } e.setTargetSlot(bigStorageDTO.get().getSlot()); cageDetails.setSlot(bigStorageDTO.get().getSlot()); cageDetails.setState(Const.GLASS_STATE_IN); temperingLayoutIdTemp.set(info.getTemperingLayoutId()); temperingFeedSequenceTemp.set(info.getTemperingFeedSequence()); bigStorageCageDetailsList.add(cageDetails); taskFlag.set(bigStorageCageFeedTaskService.updateById(e)); if (!taskFlag.get()) { return; } }); //3、更新进片任务表 遇到问题：无法批量更新，批量更新无法走指定从库 //4、在详情表中加入进片玻璃信息 bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList); if (taskFlag.get()) { String lineAddress = line.equals(Const.A09_OUT_TARGET_POSITION) ? d02GoAdress : d05GoAdress; // S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1); cageDetails.setSlot(bigStorageDTO.getSlot()); cageDetails.setState(Const.GLASS_STATE_IN); e.setTargetSlot(bigStorageDTO.getSlot()); e.setTaskType(Const.BIG_STORAGE_IN_RUN); temperingLayoutIdTemp = info.getTemperingLayoutId(); temperingFeedSequenceTemp = info.getTemperingFeedSequence(); //3、更新进片任务表 遇到问题：无法批量更新，批量更新无法走指定从库 bigStorageCageFeedTaskService.updateById(e); bigStorageCageDetailsList.add(cageDetails); } return taskFlag.get(); return bigStorageCageDetailsList; } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -12,4 +12,6 @@ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: sequence: order: false order: false minCount: 5 slotWidth: 5000 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
New file @@ -0,0 +1,76 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="com.mes.bigstorage.mapper.BigStorageCageDetailsMapper"> <resultMap id="temperingLayoutDTO" type="com.mes.bigstorage.entity.dto.TemperingLayoutDTO"> <result column="engineer_id" property="engineerId"/> <result column="tempering_layout_id" property="temperingLayoutId"/> <result column="count" property="count"/> <result column="slot_count" property="slotCount"/> </resultMap> <resultMap id="slotSequenceDTO" type="com.mes.bigstorage.entity.dto.SlotSequenceDTO"> <result column="engineer_id" property="engineerId"/> <result column="tempering_layout_id" property="temperingLayoutId"/> <result column="slot" property="slot"/> <result column="max_sequence" property="maxSequence"/> <result column="min_sequence" property="minSequence"/> <result column="remain_width" property="remainWidth"/> </resultMap> <select id="temperingIsAll" resultMap="temperingLayoutDTO"> SELECT T.ENGINEER_ID, T.TEMPERING_LAYOUT_ID, COUNT(T.TEMPERING_FEED_SEQUENCE) AS COUNT FROM GLASS_INFO T LEFT JOIN DAMAGE T1 ON T.ENGINEER_ID = T1.ENGINEER_ID AND T.GLASS_ID = T1.GLASS_ID LEFT JOIN BIG_STORAGE_CAGE_DETAILS T2 ON T.ENGINEER_ID = T2.ENGINEER_ID AND T.GLASS_ID = T2.GLASS_ID WHERE T1.GLASS_ID IS NULL AND T2.GLASS_ID IS NULL AND ( T.ENGINEER_ID , T.TEMPERING_LAYOUT_ID ) IN ( SELECT DISTINCT ENGINEER_ID , TEMPERING_LAYOUT_ID FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE = 100 ) GROUP BY T.ENGINEER_ID, T.TEMPERING_LAYOUT_ID HAVING COUNT = 0 ORDER BY T.TEMPERING_LAYOUT_ID LIMIT 1 </select> <select id="queryTemperingOccupySlot" resultMap="temperingLayoutDTO"> SELECT TEMPERING_LAYOUT_ID, COUNT(DISTINCT SLOT) as SLOT_COUNT FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE = 100 GROUP BY ENGINEER_ID, TEMPERING_LAYOUT_ID HAVING SLOT_COUNT >= #{count} LIMIT 1 </select> <select id="queryGlassMaxAndMin" resultMap="slotSequenceDTO"> SELECT T.*, T1.REMAIN_WIDTH FROM ( SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, SLOT, MAX(TEMPERING_FEED_SEQUENCE) AS MAX_SEQUENCE, MIN(TEMPERING_FEED_SEQUENCE) AS MIN_SEQUENCE FROM BIG_STORAGE_CAGE_DETAILS WHERE ENGINEER_ID = #{engineerId} AND TEMPERING_LAYOUT_ID = #{temperingLayoutId} GROUP BY ENGINEER_ID, TEMPERING_LAYOUT_ID, SLOT ) T INNER JOIN BIG_STORAGE_CAGE T1 ON T.SLOT = T1.SLOT ORDER BY T.MAX_SEQUENCE DESC </select> </mapper> hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -33,6 +33,11 @@ } @Test public void outGlass() { log.info("完整路径：{}", bigStorageCageService.outGlass()); } @Test public void computeTargetByLine() { // log.info("获取大理片笼信息：{}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.computeTargetByLine(2001, "", "");
