Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
61个文件已修改
2个文件已添加
176个文件已删除
| | |
|---|
| | | <script setup> |
|---|
| | | import {Search} from "@element-plus/icons-vue"; |
|---|
| | | import {reactive} from "vue"; |
|---|
| | | import {reactive, onMounted} from "vue"; |
|---|
| | | import {useRouter} from "vue-router" |
|---|
| | | const router = useRouter() |
|---|
| | | |
|---|
| | | const dialogFormVisiblea = ref(false) |
|---|
| | | import { ref } from 'vue' |
|---|
| | | import { ElMessage, ElMessageBox } from 'element-plus' |
|---|
| | | import Landingindication from "./Landingindication.vue"; |
|---|
| | | // import Landingindicationtwo from "./Landingindicationtwo.vue"; |
|---|
| | | import Landingindicationtwo from "./Landingindicationtwo.vue"; |
|---|
| | | import unloadrequest from "@/utils/unloadrequest"; |
|---|
| | | const dialogFormVisiblea = ref(false) |
|---|
| | | |
|---|
| | | const tableData = [ |
|---|
| | | { |
|---|
| | | id: '1', |
|---|
| | | long: '1005', |
|---|
| | | wide: '183.6', |
|---|
| | | thick: '1991', |
|---|
| | | state: '未启用', |
|---|
| | | }, |
|---|
| | | { |
|---|
| | | id: '2', |
|---|
| | | long: '105', |
|---|
| | | wide: '183', |
|---|
| | | thick: '191', |
|---|
| | | state: '未启用' |
|---|
| | | }, |
|---|
| | | { |
|---|
| | | id: '3', |
|---|
| | | long: '105', |
|---|
| | | wide: '183', |
|---|
| | | thick: '191', |
|---|
| | | state: '未启用' |
|---|
| | | }, |
|---|
| | | { |
|---|
| | | id: '4', |
|---|
| | | long: '105', |
|---|
| | | wide: '183', |
|---|
| | | thick: '191', |
|---|
| | | state: '未启用' |
|---|
| | | }, |
|---|
| | | { |
|---|
| | | id: '5', |
|---|
| | | long: '105', |
|---|
| | | wide: '183', |
|---|
| | | thick: '191', |
|---|
| | | state: '未启用' |
|---|
| | | }, |
|---|
| | | ] |
|---|
| | | |
|---|
| | | |
|---|
| | | const dialogFormVisiblea2 = ref(false) |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | let socket; |
|---|
| | | |
|---|
| | | |
|---|
| | | const initWebSocket = (token) =>{ //初始化we |
|---|
| | | |
|---|
| | | let viewname = "unloadglass"; |
|---|
| | | |
|---|
| | | if (typeof WebSocket === "undefined") { |
|---|
| | | console.log("您的浏览器不支持WebSocket"); |
|---|
| | | } else { |
|---|
| | | let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/api/talk/" + viewname; |
|---|
| | | if (socket != null) { |
|---|
| | | socket.close(); |
|---|
| | | socket = null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 开启一个websocket服务 |
|---|
| | | socket = new WebSocket(socketUrl); |
|---|
| | | |
|---|
| | | // 打开事件 |
|---|
| | | socket.onopen = function () { |
|---|
| | | console.log("websocket已打开"); |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | socket.onmessage = (msg) => { |
|---|
| | | if (!msg.data) { |
|---|
| | | return; // 如果收到空数据，则直接返回，不执行后续逻辑 |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | let obj = JSON.parse(msg.data); |
|---|
| | | |
|---|
| | | |
|---|
| | | console.log('收到消息：', obj.data); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | // 数据 |
|---|
| | | const loading = ref(false); |
|---|
| | | |
|---|
| | | |
|---|
| | | // 弹框显示控制 |
|---|
| | | |
|---|
| | | const dialogFormVisible = ref(false); |
|---|
| | | |
|---|
| | | // 表单数据 |
|---|
| | | const workstationId = ref(''); |
|---|
| | | const flowCardId = ref(''); |
|---|
| | | const flowCardOptions = ref([]); |
|---|
| | | |
|---|
| | | |
|---|
| | | // 方法 |
|---|
| | | const handleSelectionChange = () => { |
|---|
| | | // 处理表格行选择事件 |
|---|
| | | }; |
|---|
| | | |
|---|
| | | const handleBindRack = (row) => { |
|---|
| | | workstationId.value = row.workstationId; // 假设rackNumber是架号字段的属性名 |
|---|
| | | |
|---|
| | | // 发起接口请求获取流程卡号 |
|---|
| | | fetchFlowCardId(); |
|---|
| | | |
|---|
| | | |
|---|
| | | dialogFormVisiblea.value = true; // 打开绑定架子对话框 |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | //获取流程卡号 |
|---|
| | | const fetchFlowCardId = async () => { |
|---|
| | | try { |
|---|
| | | const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId'); |
|---|
| | | console.log(response) |
|---|
| | | if (response.code === 200) { |
|---|
| | | flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id })); |
|---|
| | | } else { |
|---|
| | | ElMessage.error(response.msg); |
|---|
| | | } |
|---|
| | | } catch (error) { |
|---|
| | | console.error(error); |
|---|
| | | } |
|---|
| | | }; |
|---|
| | | //确认 |
|---|
| | | const handleConfirm = async () => { |
|---|
| | | try { |
|---|
| | | const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', { |
|---|
| | | workstationId: workstationId.value, |
|---|
| | | flowCardId: flowCardId.value |
|---|
| | | }); |
|---|
| | | |
|---|
| | | console.log(response) |
|---|
| | | if (response.code == 200) { |
|---|
| | | // 绑定成功，处理逻辑 |
|---|
| | | console.log('绑定成功'); |
|---|
| | | ElMessage.success(response.message); |
|---|
| | | dialogFormVisiblea.value = false; |
|---|
| | | } else { |
|---|
| | | // 请求失败，显示错误消息 |
|---|
| | | ElMessage.error(response.msg); |
|---|
| | | } |
|---|
| | | } catch (error) { |
|---|
| | | // 处理错误 |
|---|
| | | console.error(error); |
|---|
| | | } |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | const handleBindRack2 = (row) => { |
|---|
| | | workstationId.value = row.workstationId; // 假设rackNumber是架号字段的属性名 |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | dialogFormVisiblea2.value = true; // 打开绑定架子对话框 |
|---|
| | | }; |
|---|
| | | //清除内容 |
|---|
| | | const handleclear = async () => { |
|---|
| | | try { |
|---|
| | | const response = await unloadrequest.post('/api/unLoadGlass/clear', { |
|---|
| | | workstationId: workstationId.value, |
|---|
| | | }); |
|---|
| | | |
|---|
| | | console.log(response); |
|---|
| | | |
|---|
| | | if (response.code === 200) { |
|---|
| | | // 清除成功的逻辑 |
|---|
| | | console.log('清除成功'); |
|---|
| | | ElMessage.success(response.message); |
|---|
| | | dialogFormVisiblea2.value = false; |
|---|
| | | } else if (response.code === 400) { |
|---|
| | | // 清除失败的逻辑 |
|---|
| | | console.log('清除失败'); |
|---|
| | | console.log(response.message); // 打印服务器返回的错误信息 |
|---|
| | | ElMessage.error(response.message); |
|---|
| | | dialogFormVisiblea2.value = false; |
|---|
| | | } |
|---|
| | | } catch (error) { |
|---|
| | | // console.log(error); |
|---|
| | | ElMessage.error("清除失败"); |
|---|
| | | dialogFormVisiblea2.value = false; |
|---|
| | | } |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | const tableData = reactive([]); |
|---|
| | | |
|---|
| | | // 发送获取表格数据的请求 |
|---|
| | | const fetchTableData = async () => { |
|---|
| | | try { |
|---|
| | | // 发送获取表格数据的请求，并等待响应 |
|---|
| | | const response = await unloadrequest.get('/api/unLoadGlass/getone'); |
|---|
| | | |
|---|
| | | // 检查响应状态 |
|---|
| | | if (response.code === 200) { |
|---|
| | | // 更新表格数据 |
|---|
| | | console.log('成功获取表格数据:', response.data); |
|---|
| | | tableData.splice(0, tableData.length, ...response.data); |
|---|
| | | } else { |
|---|
| | | // 请求失败，显示错误消息 |
|---|
| | | ElMessage.error(response.msg); |
|---|
| | | } |
|---|
| | | } catch (error) { |
|---|
| | | // 处理请求失败的情况 |
|---|
| | | ElMessage.error('获取表格数据失败，请重试'); |
|---|
| | | } |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | initWebSocket(); |
|---|
| | | onMounted(fetchTableData); |
|---|
| | | setInterval(fetchTableData, 2000) |
|---|
| | | |
|---|
| | | const open = () => { |
|---|
| | | ElMessageBox.confirm( |
|---|
| | | '是否删除该条信息?', |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | const dialogForm = () => { |
|---|
| | | ElMessageBox.confirm( |
|---|
| | | '是否清空该条信息?', |
|---|
| | | '提示', |
|---|
| | | { |
|---|
| | | confirmButtonText: '是', |
|---|
| | | cancelButtonText: '取消', |
|---|
| | | type: 'warning', |
|---|
| | | } |
|---|
| | | ) |
|---|
| | | } |
|---|
| | | const gridOptions = reactive({ |
|---|
| | | border: "full",//表格加边框 |
|---|
| | | keepSource: true,//保持源数据 |
|---|
| | |
|---|
| | | ], |
|---|
| | | }) |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | </script> |
|---|
| | | |
|---|
| | | <template> |
|---|
| | |
|---|
| | | <el-table height="100%" ref="table" |
|---|
| | | @selection-change="handleSelectionChange" |
|---|
| | | :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> |
|---|
| | | <el-table-column prop="id" align="center" label="下片位" min-width="80" /> |
|---|
| | | <el-table-column prop="long" align="center" label="架号" min-width="120" /> |
|---|
| | | <el-table-column prop="wide" align="center" label="流程卡号" min-width="120" /> |
|---|
| | | <el-table-column prop="wide" align="center" label="总数量" min-width="120" /> |
|---|
| | | <el-table-column prop="wide" align="center" label="已落架数量" min-width="120" /> |
|---|
| | | <el-table-column prop="state" align="center" label="启用状态" min-width="120" /> |
|---|
| | | <el-table-column prop="workstationId" align="center" label="下片位" min-width="80" /> |
|---|
| | | <el-table-column prop="workstationId" align="center" label="架号" min-width="120" /> |
|---|
| | | <el-table-column prop="flowCardId" align="center" label="流程卡号" min-width="120" /> |
|---|
| | | <el-table-column prop="totalquantity" align="center" label="总数量" min-width="120" /> |
|---|
| | | <el-table-column prop="racksnumber" align="center" label="已落架数量" min-width="120" /> |
|---|
| | | <el-table-column prop="work_state" align="center" label="状态" min-width="120" /> |
|---|
| | | <el-table-column prop="deviceId" align="center" label="设备号" min-width="120" /> |
|---|
| | | <el-table-column prop="enableState" align="center" label="启用状态" min-width="120" /> |
|---|
| | | <el-table-column fixed="right" label="操作" align="center" width="200"> |
|---|
| | | <template #default> |
|---|
| | | <el-button size="mini" type="text" plain v-show="state !== '已启用' " @click="dialogFormVisiblea = true">绑定架子</el-button> |
|---|
| | | <el-button size="mini" type="text" plain @click="dialogForm">清空</el-button> |
|---|
| | | </template> |
|---|
| | | <template #default="scope"> |
|---|
| | | <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '已启用' " @click="handleBindRack(scope.row)">绑定架子</el-button> |
|---|
| | | <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">清空</el-button> |
|---|
| | | </template> |
|---|
| | | </el-table-column> |
|---|
| | | </el-table> |
|---|
| | | </div> |
|---|
| | | </el-card> |
|---|
| | | |
|---|
| | | </div> |
|---|
| | | <div style="display: flex;"> |
|---|
| | | <div id="main-body"> |
|---|
| | | <Landingindication></Landingindication> |
|---|
| | | </div> |
|---|
| | | <!-- <div id="main-body"> |
|---|
| | | <Landingindicationtwo></Landingindicationtwo> |
|---|
| | | </div> --> |
|---|
| | | </div> |
|---|
| | | |
|---|
| | | |
|---|
| | | <el-dialog v-model="dialogFormVisiblea" top="21vh" width="30%" title="绑定架子" > |
|---|
| | | <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;"> |
|---|
| | | <el-form size="mini" label-width="150px"> |
|---|
| | | <el-form label-width="100px" label-position="right"> |
|---|
| | | <el-form-item label="架号：" :required="true" style="width: 18vw"> |
|---|
| | | <el-input autocomplete="off"/> |
|---|
| | | </el-form-item> |
|---|
| | | <el-form-item label="流程卡号：" :required="true" style="width: 18vw;"> |
|---|
| | | <el-input autocomplete="off" /> |
|---|
| | | </el-form-item> |
|---|
| | | </el-form> |
|---|
| | | </el-form> |
|---|
| | | </div> |
|---|
| | | <el-form size="mini" label-width="150px"> |
|---|
| | | <el-form label-width="100px" label-position="right"> |
|---|
| | | <el-form-item label="架号：" :required="true" style="width: 18vw"> |
|---|
| | | <el-input v-model="workstationId" autocomplete="off"/> |
|---|
| | | </el-form-item> |
|---|
| | | <el-form-item label="流程卡号：" :required="true" style="width: 18vw;"> |
|---|
| | | <el-select v-model="flowCardId" placeholder="请选择流程卡号"> |
|---|
| | | <el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id" :value="item.flowcard_id" /> |
|---|
| | | </el-select> |
|---|
| | | </el-form-item> |
|---|
| | | </el-form> |
|---|
| | | </el-form> |
|---|
| | | </div> |
|---|
| | | <template #footer> |
|---|
| | | <div id="dialog-footer"> |
|---|
| | | <el-button type="primary" @click="dialogFormVisiblea = false"> |
|---|
| | | <el-button type="primary" @click="handleConfirm"> |
|---|
| | | 确认 |
|---|
| | | </el-button> |
|---|
| | | <el-button @click="dialogFormVisiblea = false">取消</el-button> |
|---|
| | | </div> |
|---|
| | | </template> |
|---|
| | | </el-dialog> |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" title="清除架子玻璃" > |
|---|
| | | |
|---|
| | | <template #footer> |
|---|
| | | <div id="dialog-footer"> |
|---|
| | | <el-button type="primary" @click="handleclear"> |
|---|
| | | 确认 |
|---|
| | | </el-button> |
|---|
| | | <el-button @click="dialogFormVisiblea2 = false">取消</el-button> |
|---|
| | | </div> |
|---|
| | | </template> |
|---|
| | | </el-dialog> |
|---|
| | | |
|---|
| | | |
|---|
| | | <!-- workstationId: '1', |
|---|
| | | workstationId: '1005', |
|---|
| | | flowCardId: '183.6', |
|---|
| | | totalquantity: '1991', |
|---|
| | | racksnumber:"1", |
|---|
| | | work_state: '待识别', --> |
|---|
| | | </div> |
|---|
| | | <div style="display: flex;"> |
|---|
| | | <div id="main-body"> |
|---|
| | | <Landingindication></Landingindication> |
|---|
| | | </div> |
|---|
| | | <div id="main-bodya"> |
|---|
| | | <Landingindicationtwo></Landingindicationtwo> |
|---|
| | | </div></div> |
|---|
| | | </template> |
|---|
| | | |
|---|
| | | <style scoped> |
|---|
| | |
|---|
| | | height: 450px; |
|---|
| | | } |
|---|
| | | #main-body{ |
|---|
| | | margin-top: -20px; |
|---|
| | | margin-left: 300px; |
|---|
| | | } |
|---|
| | | #main-bodya{ |
|---|
| | | margin-top: -10px; |
|---|
| | | margin-left: 450px; |
|---|
| | | margin-left: 100px; |
|---|
| | | } |
|---|
| | | </style> |
|---|
| | |
|---|
| | | <artifactId>hangzhoumesParent</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.baomidou</groupId> |
|---|
| | | <artifactId>mybatis-plus-boot-starter</artifactId> |
|---|
| | | <version>3.2.0</version> |
|---|
| | | <version>3.3.1</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.baomidou</groupId> |
|---|
| | | <artifactId>dynamic-datasource-spring-boot-starter</artifactId> |
|---|
| | | <version>3.2.0</version> |
|---|
| | | <version>3.3.1</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | |
|---|
| | | <version>1.2.33</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.github.yulichang</groupId> |
|---|
| | | <artifactId>mybatis-plus-join</artifactId> |
|---|
| | | <version>1.2.4</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | </dependencies> |
|---|
| | | |
|---|
| | | |
|---|
| | |
|---|
| | | <artifactId>common</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | | <artifactId>servicebase</artifactId> |
|---|
| | | |
|---|
| | | <dependencies> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.github.yulichang</groupId> |
|---|
| | | <artifactId>mybatis-plus-join</artifactId> |
|---|
| | | <version>1.1.6</version> |
|---|
| | | </dependency> |
|---|
| | | </dependencies> |
|---|
| | | <properties> |
|---|
| | | <maven.compiler.source>8</maven.compiler.source> |
|---|
| | | <maven.compiler.target>8</maven.compiler.target> |
|---|
| | |
|---|
| | | * @since 2024-04-16 |
|---|
| | | */ |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/optimize-detail") |
|---|
| | | @RequestMapping("/optimize-detail") |
|---|
| | | public class OptimizeDetailController { |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | * @since 2024-04-16 |
|---|
| | | */ |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/optimize-layout") |
|---|
| | | @RequestMapping("/optimize-layout") |
|---|
| | | public class OptimizeLayoutController { |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/optimizeProject") |
|---|
| | | @Slf4j |
|---|
| | | |
|---|
| | | public class OptimizeProjectController { |
|---|
| | | @Autowired |
|---|
| | | //获取待选择的工程号 |
|---|
| | |
|---|
| | | @PostMapping("/saveProject") //显示工程选择信息 |
|---|
| | | public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) { |
|---|
| | | log.info("获取选择好的工程id进行查询数据后保存"); |
|---|
| | | List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest); |
|---|
| | | log.info("显示工程选择信息后进行保存:{}", glass); |
|---|
| | | List<OptimizeProject> glass = optimizeProjectService.selectSaveProject(optimizeRequest); |
|---|
| | | log.info("显示工程选择信息后保存到upPattenUsage表:{}", glass); |
|---|
| | | optimizeProjectService.insetupPattenUsage(glass); |
|---|
| | | //void insetProject(glass); |
|---|
| | | return Result.build(200, "", glass); |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | import com.baomidou.dynamic.datasource.annotation.DS; |
|---|
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|---|
| | | import com.github.yulichang.base.MPJBaseMapper; |
|---|
| | | import com.mes.pp.entity.OptimizeProject; |
|---|
| | | import com.mes.pp.entity.request.OptimizeRequest; |
|---|
| | | import org.apache.ibatis.annotations.Mapper; |
|---|
| | |
|---|
| | | */ |
|---|
| | | @Mapper |
|---|
| | | @DS("pp") |
|---|
| | | public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> { |
|---|
| | | public interface OptimizeProjectMapper extends MPJBaseMapper<OptimizeProject> { |
|---|
| | | List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest); |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.pp.service; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.IService; |
|---|
| | | import com.github.yulichang.base.MPJBaseService; |
|---|
| | | import com.mes.pp.entity.OptimizeProject; |
|---|
| | | import com.mes.pp.entity.request.OptimizeRequest; |
|---|
| | | |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-16 |
|---|
| | | */ |
|---|
| | | public interface OptimizeProjectService extends IService<OptimizeProject> { |
|---|
| | | public interface OptimizeProjectService extends MPJBaseService<OptimizeProject> { |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 查询可领取的任务工程信息 |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | List<OptimizeProject> listByState(OptimizeRequest optimizeRequest); |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 查询保存到原片使用详情表的数据 |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest); |
|---|
| | | |
|---|
| | | List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest); |
|---|
| | | /** |
|---|
| | | * 将工程信息保存到原片使用详情表 |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | void insetProject(OptimizeProject glass); |
|---|
| | | void insetupPattenUsage(List<OptimizeProject> glass); |
|---|
| | | } |
|---|
| | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|---|
| | | import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.github.yulichang.base.MPJBaseServiceImpl; |
|---|
| | | import com.mes.pp.entity.OptimizeProject; |
|---|
| | | import com.mes.pp.entity.request.OptimizeRequest; |
|---|
| | | import com.mes.pp.mapper.OptimizeProjectMapper; |
|---|
| | | import com.mes.pp.service.OptimizeProjectService; |
|---|
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
|---|
| | | import com.mes.uppattenusage.mapper.UpPattenUsageMapper; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import java.util.Collections; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | @Service |
|---|
| | | @DS("pp") |
|---|
| | | @Slf4j |
|---|
| | | public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService { |
|---|
| | | public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService { |
|---|
| | | |
|---|
| | | |
|---|
| | | @Resource |
|---|
| | | UpPattenUsageMapper upPattenUsageMapper; |
|---|
| | | @Override |
|---|
| | | public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) { |
|---|
| | | log.info("将参数传入到查询类里,工程号做非空判断模糊查询"); |
|---|
| | | LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>(); |
|---|
| | | wrapper.eq(OptimizeProject::getState, optimizeRequest.getState()) |
|---|
| | | .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()), OptimizeProject::getProjectNo, optimizeRequest.getProjectNo()) |
|---|
| | | //.groupBy(OptimizeProject::getProjectNo) |
|---|
| | | wrapper.eq(OptimizeProject::getState,optimizeRequest.getState()) |
|---|
| | | .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo()) |
|---|
| | | //.groupBy(OptimizeProject::getProjectNo) |
|---|
| | | ; |
|---|
| | | log.info("返回工程信息"); |
|---|
| | | return this.list(wrapper); |
|---|
| | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void insetProject(OptimizeProject glass) { |
|---|
| | | |
|---|
| | | public void insetupPattenUsage(List<OptimizeProject> glass) { |
|---|
| | | log.info("循环查询结果保存到UpPattenUsage表中"); |
|---|
| | | for (OptimizeProject project : glass) { |
|---|
| | | UpPattenUsage upPattenUsage = new UpPattenUsage(); |
|---|
| | | upPattenUsage.setEngineeringId(project.getProjectNo()); |
|---|
| | | upPattenUsage.setFilmsId(project.getGlassType()); |
|---|
| | | upPattenUsage.setState(project.getState()); |
|---|
| | | upPattenUsageMapper.insert(upPattenUsage); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) { |
|---|
| | | public List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest) { |
|---|
| | | log.info("将参数传入到查询类里,工程号做非空判断模糊查询"); |
|---|
| | | |
|---|
| | | log.info("返回工程信息"); |
|---|
| | |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.GetMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | * @since 2024-04-18 |
|---|
| | | */ |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/up-patten-usage") |
|---|
| | | @RequestMapping("/up-patten-usage") |
|---|
| | | @Slf4j |
|---|
| | | public class UpPattenUsageController { |
|---|
| | | |
|---|
| | |
|---|
| | | log.info("显示工位上的玻璃信息:{}", glass); |
|---|
| | | return Result.build(200, "", glass); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("点击选择工程保存后进行调用,传入工程号") |
|---|
| | | @GetMapping("/saveUpPattenUsage") //查询现在上片机的玻璃信息 |
|---|
| | | public Result<Integer> saveUpPattenUsage(@RequestBody String engineeringId) { |
|---|
| | | //List<OptimizeUpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId); |
|---|
| | | log.info("显示工位上的玻璃信息:{}", 200); |
|---|
| | | return Result.build(200, "", 200); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| New file |
| | |
|---|
| | | package com.mes.uppattenusage.entity; |
|---|
| | | |
|---|
| | | public class OptimizeUpPattenUsage { |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 工程号 |
|---|
| | | */ |
|---|
| | | private String projectNo; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 膜系id |
|---|
| | | */ |
|---|
| | | private String glassType; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 宽 |
|---|
| | | */ |
|---|
| | | private Double width; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 高 |
|---|
| | | */ |
|---|
| | | private Double height; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 厚度 |
|---|
| | | */ |
|---|
| | | private Double glassThickness; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 原片版图片序 |
|---|
| | | */ |
|---|
| | | private Integer heatLayoutSort; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 状态 |
|---|
| | | */ |
|---|
| | | private Integer state; |
|---|
| | | |
|---|
| | | // Getter methods |
|---|
| | | public String getProjectNo() { |
|---|
| | | return projectNo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getGlassType() { |
|---|
| | | return glassType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Double getWidth() { |
|---|
| | | return width; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Double getHeight() { |
|---|
| | | return height; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Double getGlassThickness() { |
|---|
| | | return glassThickness; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getHeatLayoutSort() { |
|---|
| | | return heatLayoutSort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getState() { |
|---|
| | | return state; |
|---|
| | | } |
|---|
| | | |
|---|
| | | // Setter methods |
|---|
| | | public void setProjectNo(String projectNo) { |
|---|
| | | this.projectNo = projectNo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setGlassType(String glassType) { |
|---|
| | | this.glassType = glassType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setWidth(Double width) { |
|---|
| | | this.width = width; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHeight(Double height) { |
|---|
| | | this.height = height; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setGlassThickness(Double glassThickness) { |
|---|
| | | this.glassThickness = glassThickness; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHeatLayoutSort(Integer heatLayoutSort) { |
|---|
| | | this.heatLayoutSort = heatLayoutSort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setState(Integer state) { |
|---|
| | | this.state = state; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | /** |
|---|
| | | * 膜系id |
|---|
| | | */ |
|---|
| | | private Integer filmsId; |
|---|
| | | private String filmsId; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 宽 |
|---|
| | |
|---|
| | | package com.mes.uppattenusage.mapper; |
|---|
| | | |
|---|
| | | import com.github.yulichang.base.MPJBaseMapper; |
|---|
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
|---|
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|---|
| | | |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-18 |
|---|
| | | */ |
|---|
| | | public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> { |
|---|
| | | public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> { |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.uppattenusage.service; |
|---|
| | | import com.github.yulichang.base.MPJBaseService; |
|---|
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.IService; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * <p> |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-18 |
|---|
| | | */ |
|---|
| | | public interface UpPattenUsageService extends IService<UpPattenUsage> { |
|---|
| | | public interface UpPattenUsageService extends MPJBaseService<UpPattenUsage> { |
|---|
| | | List<UpPattenUsage> prioritylist(int state); |
|---|
| | | |
|---|
| | | List<Map> saveUpPattenUsage(String engineeringId); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | package com.mes.uppattenusage.service.impl; |
|---|
| | | |
|---|
| | | import com.baomidou.dynamic.datasource.annotation.DS; |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|---|
| | | import com.github.yulichang.base.MPJBaseServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.mes.pp.entity.OptimizeProject; |
|---|
| | | import com.mes.pp.mapper.OptimizeProjectMapper; |
|---|
| | | import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; |
|---|
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
|---|
| | | import com.mes.uppattenusage.service.UpPattenUsageService; |
|---|
| | | import com.mes.uppattenusage.mapper.UpPattenUsageMapper; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import java.util.Collections; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * <p> |
|---|
| | |
|---|
| | | */ |
|---|
| | | @Service |
|---|
| | | @Slf4j |
|---|
| | | public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService { |
|---|
| | | public class UpPattenUsageServiceImpl extends MPJBaseServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | OptimizeProjectMapper optimizeProjectMapper; |
|---|
| | | @Override |
|---|
| | | public List<UpPattenUsage> prioritylist(int state) { |
|---|
| | | log.info("将参数传入到查询类里,工程号做非空判断模糊查询"); |
|---|
| | |
|---|
| | | return this.list(wrapper); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @DS("pp") |
|---|
| | | public List<Map> saveUpPattenUsage(String engineeringId) { |
|---|
| | | |
|---|
| | | if (engineeringId != null) { |
|---|
| | | |
|---|
| | | List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>() |
|---|
| | | .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort") |
|---|
| | | .leftJoin("optimize_layout b on t.project_no=b.project_no") |
|---|
| | | .eq("b.project_no",engineeringId)); |
|---|
| | | } |
|---|
| | | return Collections.emptyList(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | <artifactId>common</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <artifactId>hangzhoumesParent</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <artifactId>moduleService</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <!-- <dependency>--> |
|---|
| | | <!-- <groupId>com.github.yulichang</groupId>--> |
|---|
| | | <!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>--> |
|---|
| | | <!-- <version>1.4.12</version>--> |
|---|
| | | <!-- </dependency>--> |
|---|
| | | </dependencies> |
|---|
| | | |
|---|
| | |
|---|
| | | import com.mes.taskcache.entity.TaskCache; |
|---|
| | | import com.mes.taskcache.service.impl.TaskCacheServiceImpl; |
|---|
| | | import com.mes.utils.Result; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | @Api("磨边前缓存") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/edgStorageCage") |
|---|
| | | public class EdgStorageCageController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private EdgStorageCageServiceImpl edgStorageCageServiceImpl; |
|---|
| | | private EdgStorageCageService edgStorageCageService; |
|---|
| | | |
|---|
| | | |
|---|
| | | //查询磨边缓存理片笼内详情 |
|---|
| | | @ApiOperation("查询磨边缓存理片笼内详情 参数()") |
|---|
| | | @PostMapping("/selectEdgStorageCage") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectEdgStorageCage () { |
|---|
| | | List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages(); |
|---|
| | | List<Map> list=edgStorageCageService.selectEdgStorageCages(); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | //添加磨边缓存理片笼信息 功能：笼内绑定玻璃 |
|---|
| | | @ApiOperation("添加磨边缓存理片笼信息 功能：笼内绑定玻璃 参数(EdgStorageCage edgStorageCage)") |
|---|
| | | @PostMapping("/insertEdgStorageCage") |
|---|
| | | @ResponseBody |
|---|
| | | public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { |
|---|
| | | boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); |
|---|
| | | boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); |
|---|
| | | return Result.build(200,"添加成功",1); |
|---|
| | | } |
|---|
| | | //修改磨边缓存理片笼信息 功能：对笼内栅格进行【启用/禁用】/ 【更换】笼内栅格玻璃信息 |
|---|
| | | @ApiOperation("修改磨边缓存理片笼信息 功能：对笼内栅格进行【启用/禁用】/ 【更换】笼内栅格玻璃信息") |
|---|
| | | @PostMapping("/updateEdgStorageCage") |
|---|
| | | @ResponseBody |
|---|
| | | public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { |
|---|
| | | boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); |
|---|
| | | boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); |
|---|
| | | return Result.build(200,"更换成功",1); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //删除磨边缓存理片笼信息 功能：对笼内栅格玻璃进行【清除】 |
|---|
| | | @ApiOperation("删除磨边缓存理片笼信息 功能：对笼内栅格玻璃进行【清除】") |
|---|
| | | @PostMapping("/deleteEdgStorageCage") |
|---|
| | | @ResponseBody |
|---|
| | | public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { |
|---|
| | | boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); |
|---|
| | | boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); |
|---|
| | | return Result.build(200,"删除成功",1); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | package com.mes.edgstoragecage.service; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.IService; |
|---|
| | | import com.github.yulichang.base.MPJBaseService; |
|---|
| | | import com.mes.edgstoragecage.entity.EdgStorageCageDetails; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> { |
|---|
| | | public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> { |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 识别 破损/拿走 |
|---|
| | |
|---|
| | | package com.mes.edgstoragecage.service; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.IService; |
|---|
| | | import com.github.yulichang.base.MPJBaseService; |
|---|
| | | import com.mes.edgstoragecage.entity.EdgStorageCage; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | public interface EdgStorageCageService extends IService<EdgStorageCage> { |
|---|
| | | public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> { |
|---|
| | | |
|---|
| | | //查询笼内空格 |
|---|
| | | List<Map> selectCacheEmpty(); |
|---|
| | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.github.yulichang.base.MPJBaseServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.github.yulichang.wrapper.interfaces.LambdaJoin; |
|---|
| | | import com.mes.edgstoragecage.entity.EdgStorageCage; |
|---|
| | | import com.mes.edgstoragecage.entity.EdgStorageCageDetails; |
|---|
| | | import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper; |
|---|
| | | import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; |
|---|
| | | import com.mes.taskcache.mapper.HangzhouMesMapper; |
|---|
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
|---|
| | | import com.mes.uppattenusage.mapper.UpPattenUsageMapper; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | @Service |
|---|
| | | public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService { |
|---|
| | | //获取全部数据 |
|---|
| | | public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper; |
|---|
| | | UpPattenUsageMapper upPattenUsageMapper; |
|---|
| | | |
|---|
| | | //识别 破损/拿走 |
|---|
| | | public boolean identWorn(String glassid, int ControlsId) { |
|---|
| | | List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid)); |
|---|
| | | List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid)); |
|---|
| | | if (edgStorageCageDetails.size() == 1) { |
|---|
| | | edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid)); |
|---|
| | | baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid)); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | return false; |
|---|
| | |
|---|
| | | //获取 切割当前版图 |
|---|
| | | @Override |
|---|
| | | public List<Map> selectCutTerritory() { |
|---|
| | | List<Map> list = edgStorageCageDetailsMapper.selectJoinList( |
|---|
| | | Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class) |
|---|
| | | List<Map> list = upPattenUsageMapper.selectJoinList( |
|---|
| | | Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class) |
|---|
| | | .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height") |
|---|
| | | .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence") |
|---|
| | | .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id") |
|---|
| | | .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id") |
|---|
| | | .eq("state", 1) |
|---|
| | | .eq("t.state", 1) |
|---|
| | | .orderByAsc("t.layout_sequence") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | |
|---|
| | | //获取 工程下的当前版图 |
|---|
| | | @Override |
|---|
| | | public List<Map> selectCurrentCutTerritory(String current) { |
|---|
| | | List<Map> list = edgStorageCageDetailsMapper.selectJoinList( |
|---|
| | | List<Map> list = baseMapper.selectJoinList( |
|---|
| | | Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class) |
|---|
| | | .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height") |
|---|
| | | .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id") |
|---|
| | |
|---|
| | | .eq("t.engineering_id", current) |
|---|
| | | .orderByAsc("t.layout_sequence") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | ; |
|---|
| | |
|---|
| | | package com.mes.edgstoragecage.service.impl; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.github.yulichang.base.MPJBaseServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.mes.edgstoragecage.entity.EdgStorageCage; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | @Service |
|---|
| | | public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService { |
|---|
| | | public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | EdgStorageCageMapper edgStorageCageMapper; |
|---|
| | | @Autowired |
|---|
| | | EdgStorageCageDetailsMapper edgStorageCageDetailsMapper; |
|---|
| | | @Autowired |
|---|
| | |
|---|
| | | @Override |
|---|
| | | //查询笼内空格 |
|---|
| | | public List<Map> selectCacheEmpty(){ |
|---|
| | | List<Map> map=edgStorageCageMapper.selectJoinList( |
|---|
| | | List<Map> map=baseMapper.selectJoinList( |
|---|
| | | Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class) |
|---|
| | | .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height") |
|---|
| | | .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot") |
|---|
| | |
|---|
| | | @Override |
|---|
| | | //理片缓存详情 |
|---|
| | | public List<Map> selectEdgStorageCages(){ |
|---|
| | | List<Map> map=edgStorageCageMapper.selectJoinList( |
|---|
| | | List<Map> map=baseMapper.selectJoinList( |
|---|
| | | Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class) |
|---|
| | | .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height") |
|---|
| | | .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot") |
|---|
| | |
|---|
| | | @Override |
|---|
| | | //修改理片笼内信息 功能：对笼内栅格玻璃 【添加/删除/更换】 |
|---|
| | | public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){ |
|---|
| | | edgStorageCageMapper.updateById(edgStorageCage); |
|---|
| | | baseMapper.updateById(edgStorageCage); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | import com.mes.glassinfo.entity.GlassInfo; |
|---|
| | | import com.mes.glassinfo.service.GlassInfoService; |
|---|
| | | import com.mes.utils.Result; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | |
|---|
| | | public class GlassInfoController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private GlassInfoServiceImpl GlassInfoServiceImpl; |
|---|
| | | private GlassInfoService glassInfoService; |
|---|
| | | |
|---|
| | | @PostMapping("/selectId") // 查询切割版图信息-根据 工程号 |
|---|
| | | @ApiOperation("根据玻璃小片ID查询 玻璃数据：参数(玻璃ID)") |
|---|
| | | @PostMapping("/selectId") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectId(String ProcessId) { |
|---|
| | | List<GlassInfo> list = GlassInfoServiceImpl.selectId(ProcessId); |
|---|
| | | List<GlassInfo> list = glassInfoService.selectId(ProcessId); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selectAll") // 查询切割版图信息-根据 工程号 |
|---|
| | | @ApiOperation("查询所有玻璃小片信息 玻璃数据 参数()") |
|---|
| | | @PostMapping("/selectAll") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectAll() { |
|---|
| | | List<GlassInfo> list = GlassInfoServiceImpl.selectAll(); |
|---|
| | | List<GlassInfo> list = glassInfoService.selectAll(); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selectFlowCardId") // 查询切割版图信息-根据 工程号 |
|---|
| | | @ApiOperation("查询工程下的玻璃小片信息 玻璃数据 参数(工程号)") |
|---|
| | | @PostMapping("/selectFlowCardId") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectFlowCardId(String flowCardId) { |
|---|
| | | List<GlassInfo> list = GlassInfoServiceImpl.selectFlowCardId(flowCardId); |
|---|
| | | List<GlassInfo> list = glassInfoService.selectFlowCardId(flowCardId); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | @Service |
|---|
| | | public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | GlassInfoMapper glassInfoMapper; |
|---|
| | | |
|---|
| | | //根据ID 获取小片数据 |
|---|
| | | @Override |
|---|
| | | public List<GlassInfo> selectId(String glassId){ |
|---|
| | | return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId)); |
|---|
| | | }; |
|---|
| | | |
|---|
| | | //获取全部小片数据 |
|---|
| | | @Override |
|---|
| | | public List<GlassInfo> selectAll(){ |
|---|
| | | return glassInfoMapper.selectList(null); |
|---|
| | | return baseMapper.selectList(null); |
|---|
| | | }; |
|---|
| | | |
|---|
| | | //根据工程 获取小片数据 |
|---|
| | | @Override |
|---|
| | | public List<GlassInfo> selectFlowCardId(String flowCardId){ |
|---|
| | | return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId)); |
|---|
| | | }; |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.taskcache.controller; |
|---|
| | | |
|---|
| | | import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; |
|---|
| | | import com.mes.edgstoragecage.service.EdgStorageCageService; |
|---|
| | | import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl; |
|---|
| | | import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl; |
|---|
| | | import com.mes.taskcache.service.HangzhoumesService; |
|---|
| | | import com.mes.taskcache.service.PpService; |
|---|
| | | import com.mes.utils.Result; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | |
|---|
| | | public class TaskCacheController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private EdgStorageCageServiceImpl edgStorageCageServiceImpl; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl; |
|---|
| | | private EdgStorageCageDetailsService edgStorageCageDetailsService; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private HangzhoumesService hangzhoumesService; |
|---|
| | | |
|---|
| | | @PostMapping("/cutTerritory") // 查询切割版图信息-根据 工程号 |
|---|
| | | @ApiOperation("查询切割版图信息-根据 工程号 参数(工程号)") |
|---|
| | | @PostMapping("/cutTerritory") |
|---|
| | | @ResponseBody |
|---|
| | | public Result cutTerritory(String current) { |
|---|
| | | List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current); |
|---|
| | | List<Map> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current); |
|---|
| | | return Result.build(200,"成功",h); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/currentCutTerritory") // 识别显示 当前版图 |
|---|
| | | @ApiOperation("识别显示 当前版图 参数()") |
|---|
| | | @PostMapping("/currentCutTerritory") |
|---|
| | | @ResponseBody |
|---|
| | | public Result currentCutTerritory() { |
|---|
| | | List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory(); |
|---|
| | | List<Map> h = edgStorageCageDetailsService.selectCutTerritory(); |
|---|
| | | return Result.build(200,"成功",h); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selectCutTerritory") // 识别显示 特定版图 |
|---|
| | | @ApiOperation("识别显示 特定版图 参数(版图编号)") |
|---|
| | | @PostMapping("/selectCutTerritory") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectCutTerritory(String TerritoryId) { |
|---|
| | | List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory(); |
|---|
| | | List<Map> h = edgStorageCageDetailsService.selectCutTerritory(); |
|---|
| | | return Result.build(200,"成功",h); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/identControls") // 识别操作： 破损/拿走 参数（ID，功能[0:破损，1：拿走]） |
|---|
| | | @ApiOperation("识别操作： 破损/拿走 参数（ID,功能[0:破损，1：拿走]）") |
|---|
| | | @PostMapping("/identControls") |
|---|
| | | @ResponseBody |
|---|
| | | public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) { |
|---|
| | | |
|---|
| | | boolean issucess = edgStorageCageDetailsServiceImpl.identWorn(identId,controlsId); |
|---|
| | | boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId); |
|---|
| | | return Result.build(200,"成功",issucess); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selectCageInfo") // 查询笼内信息 |
|---|
| | | @ApiOperation("查询笼内信息 参数()") |
|---|
| | | @PostMapping("/selectCageInfo") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectCageInfo(String ProcessId) { |
|---|
| | | public Result selectCageInfo() { |
|---|
| | | List<Map> h = hangzhoumesService.SelectCageInfo(); |
|---|
| | | return Result.build(200,"成功",h); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selectEdgTask") //磨边任务 |
|---|
| | | @ApiOperation("磨边任务 参数()") |
|---|
| | | @PostMapping("/selectEdgTask") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectEdgTask(String ProcessId) { |
|---|
| | | List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1"); |
|---|
| | |
|---|
| | | @Service |
|---|
| | | public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | GlassInfoMapper glassInfoMapper; |
|---|
| | | @Autowired |
|---|
| | | TaskCacheMapper taskCacheMapper; |
|---|
| | | //添加理片笼任务 |
|---|
| | | @Override |
|---|
| | | public boolean insertTaskCache(TaskCache taskCache){ |
|---|
| | | taskCacheMapper.insert(taskCache); |
|---|
| | | baseMapper.insert(taskCache); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | //查询磨边任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectEdgInfo(String line) { |
|---|
| | | return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line)); |
|---|
| | | } |
|---|
| | | //查询待理片工作的任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectCacheInfo(){ |
|---|
| | | return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0)); |
|---|
| | | } |
|---|
| | | //查询全部任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectAll() { |
|---|
| | | return taskCacheMapper.selectList(null); |
|---|
| | | return baseMapper.selectList(null); |
|---|
| | | } |
|---|
| | | //查询待进片任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectInputTaskCache(){ |
|---|
| | | return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //查询待出片任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectOutTaskCache(){ |
|---|
| | | return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2)); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //查询 A09 或 A10 最新的一片 出片任务 |
|---|
| | | @Override |
|---|
| | | public List<TaskCache> selectLastOutCacheInfo(String line){ |
|---|
| | | return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID")); |
|---|
| | | return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID")); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes; |
|---|
| | | |
|---|
| | | import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; |
|---|
| | | import com.mes.edgstoragecage.service.EdgStorageCageService; |
|---|
| | | import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.junit.Test; |
|---|
| | |
|---|
| | | public class CacheGlassModuleApplicationTest { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | EdgStorageCageServiceImpl edgStorageCageServiceImpl; |
|---|
| | | EdgStorageCageService edgStorageCageService; |
|---|
| | | @Autowired |
|---|
| | | EdgStorageCageDetailsService edgStorageCageDetailsService; |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testFindPath() { |
|---|
| | |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testCacheGlass() { |
|---|
| | | List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages(); |
|---|
| | | List<Map> map= edgStorageCageService.selectEdgStorageCages(); |
|---|
| | | log.info("笼内信息：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | @Test |
|---|
| | | public void testselectCacheEmpty() { |
|---|
| | | List<Map> map= edgStorageCageServiceImpl.selectCacheEmpty(); |
|---|
| | | List<Map> map= edgStorageCageService.selectCacheEmpty(); |
|---|
| | | log.info("笼内空格：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | @Test |
|---|
| | | public void testScan() { |
|---|
| | | List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages(); |
|---|
| | | List<Map> map= edgStorageCageDetailsService.selectCutTerritory(); |
|---|
| | | log.info("切割当前版图信息：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | <artifactId>moduleService</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <artifactId>mybatis-plus-join</artifactId> |
|---|
| | | <version>1.1.6</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.github.yulichang</groupId> |
|---|
| | | <artifactId>mybatis-plus-join</artifactId> |
|---|
| | | <version>1.1.6</version> |
|---|
| | | </dependency> |
|---|
| | | </dependencies> |
|---|
| | | <properties> |
|---|
| | | <maven.compiler.source>8</maven.compiler.source> |
|---|
| | |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; |
|---|
| | | import com.mes.bigstoragetask.entity.BigStorageCageOutTask; |
|---|
| | | import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService; |
|---|
| | | import io.swagger.annotations.ApiModel; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.GetMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | |
|---|
| | | */ |
|---|
| | | @ApiModel("进片任务信息") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/big-storage-cage-feed-task") |
|---|
| | | @RequestMapping("/big-storage-cage-feed-task") |
|---|
| | | public class BigStorageCageFeedTaskController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | |
|---|
| | | package com.mes.userinfo.controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|---|
| | | import com.mes.bigstorage.entity.BigStorageCage; |
|---|
| | | import com.mes.bigstoragetask.entity.BigStorageCageOutTask; |
|---|
| | | import com.mes.bigstoragetask.service.BigStorageCageOutTaskService; |
|---|
| | | import io.swagger.annotations.ApiModel; |
|---|
| | |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.GetMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | |
|---|
| | | */ |
|---|
| | | @ApiModel("出片任务信息") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/big-storage-cage-out-task") |
|---|
| | | @RequestMapping("/big-storage-cage-out-task") |
|---|
| | | public class BigStorageCageOutTaskController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | |
|---|
| | | |
|---|
| | | |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | * @since 2024-04-16 |
|---|
| | | */ |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/userinfo/task-cache") |
|---|
| | | @RequestMapping("/task-cache") |
|---|
| | | public class TaskCacheController { |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | spring: |
|---|
| | | datasource: |
|---|
| | | driver-class-name: com.mysql.cj.jdbc.Driver |
|---|
| | | url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false |
|---|
| | | username: root |
|---|
| | | password: beibo.123/ |
|---|
| | | dynamic: |
|---|
| | | primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master |
|---|
| | | strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. |
|---|
| | | datasource: |
|---|
| | | hangzhoumes: |
|---|
| | | url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 |
|---|
| | | username: root |
|---|
| | | password: beibo.123/ |
|---|
| | | driver-class-name: com.mysql.cj.jdbc.Driver |
|---|
| | | salve_hangzhoumes: |
|---|
| | | url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes |
|---|
| | | username: sa |
|---|
| | | password: beibo.123/ |
|---|
| | | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver |
|---|
| | | cloud: |
|---|
| | | nacos: |
|---|
| | | discovery: |
|---|
| | |
|---|
| | | <artifactId>moduleService</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | |
|---|
| | | //新增工位信息修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id |
|---|
| | | //删除工位信息也用这个,除了工位id玻璃信息传null |
|---|
| | | @ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息") |
|---|
| | | @ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息,传递Upworkstation类,只修改宽高厚数量膜系") |
|---|
| | | @PostMapping("/updateGlassMessage") |
|---|
| | | @ResponseBody |
|---|
| | | public void updateGlassMessage(@RequestBody UpWorkstation upwork) { |
|---|
| | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import lombok.Data; |
|---|
| | | import lombok.EqualsAndHashCode; |
|---|
| | | |
|---|
| | |
|---|
| | | /** |
|---|
| | | * 膜系 |
|---|
| | | */ |
|---|
| | | private Integer filmsId; |
|---|
| | | private String filmsId; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 数量 |
|---|
| | |
|---|
| | | package com.mes; |
|---|
| | | |
|---|
| | | import com.mes.pp.entity.OptimizeProject; |
|---|
| | | import com.mes.pp.mapper.OptimizeProjectMapper; |
|---|
| | | import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; |
|---|
| | | import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.junit.Test; |
|---|
| | | import org.junit.runner.RunWith; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.boot.test.context.SpringBootTest; |
|---|
| | | import org.springframework.test.context.junit4.SpringRunner; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import java.util.Arrays; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Author : zhoush |
|---|
| | |
|---|
| | | |
|---|
| | | @Resource |
|---|
| | | private OptimizeProjectMapper optimizeProjectMapper; |
|---|
| | | @Autowired |
|---|
| | | private UpPattenUsageServiceImpl upPattenUsageService; |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void test() { |
|---|
| | |
|---|
| | | public void testFindPath() { |
|---|
| | | log.info("完整路径：{}", Arrays.asList("123")); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testFindPa() { |
|---|
| | | List<Map> glass = upPattenUsageService.saveUpPattenUsage("P24032204"); |
|---|
| | | log.info("完整路径：{}", Arrays.asList(glass)); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | <artifactId>moduleService</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <artifactId>moduleService</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <version>1.2.4</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.microsoft.sqlserver</groupId> |
|---|
| | | <artifactId>sqljdbc4</artifactId> |
|---|
| | | <version>4.0</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | </dependencies> |
|---|
| | | |
|---|
| | | <properties> |
|---|
| | |
|---|
| | | System.out.println("启动完成"); |
|---|
| | | |
|---|
| | | |
|---|
| | | new PLCAutoMes().start(); |
|---|
| | | |
|---|
| | | new Plchome().start(); |
|---|
| | | // new PLCAutoMes().start(); |
|---|
| | | // |
|---|
| | | // new Plchome().start(); |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | public class DownGlassInfoController { |
|---|
| | | |
|---|
| | | |
|---|
| | | // Other endpoints can be added for CRUD operations |
|---|
| | | } |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | @Api(tags = "下料任务") |
|---|
| | | |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/downGlassTask") |
|---|
| | | public class DownGlassTaskController { |
|---|
| | | |
|---|
| | | //todo: 实例代码 待删除 |
|---|
| | | @ApiOperation("测试") |
|---|
| | | @GetMapping("/index") |
|---|
| | | public String index() { |
|---|
| | | return "hello world"; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | package com.mes.downglassinfo.entity; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import lombok.Data; |
|---|
| | | import lombok.EqualsAndHashCode; |
|---|
| | |
|---|
| | | /** |
|---|
| | | * id |
|---|
| | | */ |
|---|
| | | @TableId(value = "id", type = IdType.AUTO) |
|---|
| | | @TableId(value = "id") |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | package com.mes.downglassinfo.mapper; |
|---|
| | | |
|---|
| | | import com.baomidou.dynamic.datasource.annotation.DS; |
|---|
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|---|
| | | import com.mes.downglassinfo.entity.DownGlassTask; |
|---|
| | | |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-04-07 |
|---|
| | | */ |
|---|
| | | @DS("salve_hangzhoumes") |
|---|
| | | public interface DownGlassTaskMapper extends BaseMapper<DownGlassTask> { |
|---|
| | | |
|---|
| | | |
|---|
| | |
|---|
| | | |
|---|
| | | List<DownGlassTask> getUnloadingTaskState(); |
|---|
| | | |
|---|
| | | void updateTaskStateToZero(String flowCardId); |
|---|
| | | void updateTaskStateToZero(long id); |
|---|
| | | |
|---|
| | | void deleteTask(String flowCardId); |
|---|
| | | void deleteTask(long id); |
|---|
| | | |
|---|
| | | DownGlassTask selectLastOutCacheInfo(String endCell); |
|---|
| | | |
|---|
| | | Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId); |
|---|
| | | Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId); |
|---|
| | | } |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void updateTaskStateToZero(String flowCardId) { |
|---|
| | | public void updateTaskStateToZero(long id) { |
|---|
| | | UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>(); |
|---|
| | | updateWrapper.set("task_stauts", 0).eq("flow_card_id", flowCardId); |
|---|
| | | updateWrapper.set("task_stauts", 0).eq("id", id); |
|---|
| | | baseMapper.update(null, updateWrapper); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void deleteTask(String flowCardId) { |
|---|
| | | public void deleteTask(long id) { |
|---|
| | | LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>(); |
|---|
| | | queryWrapper.eq(DownGlassTask::getFlowCardId, flowCardId); |
|---|
| | | queryWrapper.eq(DownGlassTask::getId, id); |
|---|
| | | |
|---|
| | | baseMapper.delete(queryWrapper); |
|---|
| | | } |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) { |
|---|
| | | public Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) { |
|---|
| | | DownGlassTask glassInfo = new DownGlassTask(); |
|---|
| | | glassInfo.setId(id); |
|---|
| | | glassInfo.setStartCell(start); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import com.mes.downstorage.service.DownStorageCageDetailsService; |
|---|
| | | import com.mes.downstorage.service.DownStorageCageService; |
|---|
| | | import com.mes.utils.Result; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | @Api(tags = "缓存") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/down-storage-cage-details") |
|---|
| | | @RequestMapping("/api/unLoadGlass/downstorage") |
|---|
| | | public class DownStorageCageDetailsController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private DownStorageCageDetailsService downStorageCageDetailsService; |
|---|
| | | @Autowired |
|---|
| | | private DownStorageCageService downStorageCageService; |
|---|
| | | |
|---|
| | | @PostMapping("/add") |
|---|
| | | public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) { |
|---|
| | |
|---|
| | | return "Details added successfully"; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | //查询磨边缓存理片笼内详情 |
|---|
| | | @ApiOperation("查询磨边缓存理片笼内详情") |
|---|
| | | @GetMapping("/selectStorageCage") |
|---|
| | | @ResponseBody |
|---|
| | | public Result selectEdgStorageCage () { |
|---|
| | | List<Map> list=downStorageCageService.getCacheInfo(); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | // |
|---|
| | | |
|---|
| | | |
|---|
| | | // Other CRUD operations can be defined here |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.downstorage.mapper; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|---|
| | | import com.mes.downglassinfo.entity.DownGlassTask; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import org.apache.ibatis.annotations.Insert; |
|---|
| | | import org.apache.ibatis.annotations.Mapper; |
|---|
| | | import org.apache.ibatis.annotations.Select; |
|---|
| | | import com.mes.glassinfo.entity.GlassInfo; |
|---|
| | | import org.apache.ibatis.annotations.*; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * <p> |
|---|
| | | * Mapper 接口 |
|---|
| | | * Mapper 接口 |
|---|
| | | * </p> |
|---|
| | | * |
|---|
| | | * @author zhoush |
|---|
| | |
|---|
| | | */ |
|---|
| | | @Mapper |
|---|
| | | public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> { |
|---|
| | | // |
|---|
| | | // |
|---|
| | | // @Select("select * from `glass_info` where id=#{id}") |
|---|
| | | // GlassInfo SelectGlassId(String id); |
|---|
| | | // 查询笼子内空闲 |
|---|
| | |
|---|
| | | |
|---|
| | | // 查询符合工位的出片玻璃 |
|---|
| | | @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN #{start} and #{end} order by escd.tempering_layout_id,escd.tempering_feed_sequence") |
|---|
| | | List<DownStorageCageDetails> SelectCacheOut(int start, int end); |
|---|
| | | |
|---|
| | | List<DownStorageCageDetails> SelectCacheOut(int start,int end); |
|---|
| | | //SELECT* from (SELECT DISTINCT escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN 1 and 5 order by escd.tempering_layout_id,escd.tempering_feed_sequence) as cc ORDER BY cc.width desc |
|---|
| | | // 查询笼子内信息 |
|---|
| | | @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot") |
|---|
| | | List<DownStorageCageDetails> SelectCachInfo(); |
|---|
| | | |
|---|
| | | // 查询可进此片玻璃的栅格号 |
|---|
| | | // 查询可进此片玻璃的栅格号 找到相同版图id并且大于前面的顺序的空格 |
|---|
| | | @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null and escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence") |
|---|
| | | List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence, |
|---|
| | | double width); |
|---|
| | |
|---|
| | | |
|---|
| | | // 添加下片任务 |
|---|
| | | @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)") |
|---|
| | | Integer insertCacheTask(String id, String start, String end, String type, double width, double height, Integer filmsId, double thickness, String flowCardId); |
|---|
| | | Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId); |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.downstorage.mapper; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|---|
| | | import com.github.yulichang.base.MPJBaseMapper; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCage; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-03-27 |
|---|
| | | */ |
|---|
| | | public interface DownStorageCageMapper extends BaseMapper<DownStorageCage> { |
|---|
| | | public interface DownStorageCageMapper extends MPJBaseMapper<DownStorageCage> { |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | import com.mes.common.PLCAutoMes; |
|---|
| | | import com.mes.common.S7control; |
|---|
| | | import com.mes.device.PlcParameterObject; |
|---|
| | | |
|---|
| | | import com.mes.downglassinfo.entity.DownGlassTask; |
|---|
| | | import com.mes.downglassinfo.service.DownGlassTaskService; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import com.mes.downstorage.mapper.DownStorageCageDetailsMapper; |
|---|
| | | import com.mes.downworkstation.mapper.DownWorkstationMapper; |
|---|
| | | import com.mes.tools.WebSocketServer; |
|---|
| | | import com.mes.glassinfo.entity.GlassInfo; |
|---|
| | | import com.mes.glassinfo.service.GlassInfoService; |
|---|
| | | import com.mes.tools.WebSocketServer; |
|---|
| | | import lombok.Data; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | import static jdk.nashorn.internal.runtime.regexp.joni.Config.log; |
|---|
| | | |
|---|
| | | @Data |
|---|
| | | @Service |
|---|
| | | public class DownGlassCacheLogic { |
|---|
| | | @Autowired |
|---|
| | | private DownStorageCageDetailsMapper selectInfo; |
|---|
| | | private GlassInfoService GlassInfoService; |
|---|
| | | private DownStorageCageDetailsService downStorageCageDetailsService; |
|---|
| | | private DownGlassTaskService downGlassTaskService; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @param Number //识别逻辑 不交互 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | public void identify(String Number) { |
|---|
| | | //查询任务 |
|---|
| | | PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; |
|---|
| | | S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1); |
|---|
| | | String s = S7control.getinstance().ReadWord("DB14.26", 1).get(0) + ""; |
|---|
| | | boolean isexist = isExist(Number); |
|---|
| | | if (isexist) { |
|---|
| | | //存在逻辑 1.添加信息 2.回复PLC存在 |
|---|
| | | //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1); |
|---|
| | | } else { |
|---|
| | | //不存在逻辑 1.回复PLC不存在 |
|---|
| | | //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | //下片前理片 |
|---|
| | | public static final String RESULT_IN = "1"; |
|---|
| | | public static final String RESULT_OUT = "2"; |
|---|
| | | public static final String RESULT_IN_OUT = "3"; |
|---|
| | | @Autowired |
|---|
| | | private DownStorageCageDetailsMapper selectInfo; |
|---|
| | | private GlassInfoService GlassInfoService; |
|---|
| | | private DownStorageCageService downStorageCageService; |
|---|
| | | private DownGlassTaskService downGlassTaskService; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public void process() { |
|---|
| | | String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + ""; |
|---|
| | |
|---|
| | | |
|---|
| | | public boolean processInto(String Number) { |
|---|
| | | GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class); |
|---|
| | | downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class); |
|---|
| | | |
|---|
| | | //按id查询玻璃信息表里的玻璃 |
|---|
| | | GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number); |
|---|
| | | PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; |
|---|
| | | //存在此玻璃编号 |
|---|
| | | if (GlassInfo != null) { |
|---|
| | | //同钢化版图内的栅格号 |
|---|
| | | List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth()); |
|---|
| | | //同钢化版图内的栅格号 找到相同版图id并且大于前面的顺序的空格 |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByLayoutAndSequence(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth()); |
|---|
| | | //空栅格号 |
|---|
| | | if (list.size() == 0) { |
|---|
| | | list = selectInfo.SelectCacheLeisure(); |
|---|
| | | //查询笼子内空闲 |
|---|
| | | list = downStorageCageService.getCacheLeisure(); |
|---|
| | | } |
|---|
| | | //小于此玻璃钢化版图序号的栅格号 |
|---|
| | | if (list.size() == 0) { |
|---|
| | | list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth()); |
|---|
| | | list = downStorageCageService.getIsExistIntoCacheByLayout(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth()); |
|---|
| | | } |
|---|
| | | if (list.size() > 0) { |
|---|
| | | //存在空格 |
|---|
| | |
|---|
| | | selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId()); |
|---|
| | | |
|---|
| | | S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1); |
|---|
| | | //完成后插入小片数据到缓存表 |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | String G11 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + ""; |
|---|
| | | String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + ""; |
|---|
| | | PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; |
|---|
| | | List<DownStorageCageDetails> list = selectInfo.SelectCacheOut(1, 5); |
|---|
| | | List<DownStorageCageDetails> list2 = selectInfo.SelectCacheOut(6, 10); |
|---|
| | | List<DownStorageCageDetails> list3 = selectInfo.SelectCacheOut(1, 10); |
|---|
| | | |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5); |
|---|
| | | List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10); |
|---|
| | | List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10); |
|---|
| | | // 优先 超出尺寸优先人工出片 人工处理 |
|---|
| | | if (!list3.isEmpty()) { |
|---|
| | | DownStorageCageDetails item3 = list3.get(0); |
|---|
| | | if (item3.getHeight() >= 1 && item3.getWidth() >= 1) { |
|---|
| | | |
|---|
| | | String endcell = "13"; |
|---|
| | | String SendEndcell = "1"; |
|---|
| | | |
|---|
| | | selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId()); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1"); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | //同时请求 优先后端出片 |
|---|
| | | else if (!list3.isEmpty()) { |
|---|
| | | DownStorageCageDetails item3 = list3.get(0); |
|---|
| | | if (G06.equals("0") && G11.equals("0")) { |
|---|
| | | |
|---|
| | | String endcell = "11"; |
|---|
| | | String SendEndcell = "1"; |
|---|
| | | |
|---|
| | | selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId()); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1"); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // 按照顺序符合前端出片 |
|---|
| | | if (!list.isEmpty()) { |
|---|
| | | else if (!list.isEmpty()) { |
|---|
| | | DownStorageCageDetails item = list.get(0); |
|---|
| | | if (G06.equals("0") && G11.equals("1")) { |
|---|
| | | // 出到 G06 |
|---|
| | |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1"); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | // 超出尺寸优先人工出片 人工处理 |
|---|
| | | } else if (!list3.isEmpty()) { |
|---|
| | | DownStorageCageDetails item3 = list3.get(0); |
|---|
| | | if (item3.getHeight() >= 3440 && item3.getWidth() >= 1440) { |
|---|
| | | |
|---|
| | | String endcell = "06"; |
|---|
| | | String SendEndcell = "1"; |
|---|
| | | |
|---|
| | | selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId()); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1"); |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | // 返回结果 |
|---|
| | | return false; |
|---|
| | | } |
|---|
| | | |
|---|
| | | //查询是否绑定架子 |
|---|
| | | // public boolean selectFlowCardId(String FlowCardId){ |
|---|
| | | // |
|---|
| | | // } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @param Number //磨边 不交互 理片和磨边机自己交互 |
|---|
| | | * @param Number |
|---|
| | | * //磨边 不交互 理片和磨边机自己交互 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | public void processMb(String Number) { |
|---|
| | | //按id查询玻璃信息表里的玻璃 |
|---|
| | | GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number); |
|---|
| | | PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; |
|---|
| | | if (GlassInfo != null) { |
|---|
| | | //发送任务 ID 长 宽 厚 倒角 工艺功能等 |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.22").getAddress(), "N10000"); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.24").getAddress(), "1000"); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.26").getAddress(), "800"); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "60"); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.30").getAddress(), "2"); |
|---|
| | | S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1"); |
|---|
| | | } |
|---|
| | | //返回结果 |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | public interface DownStorageCageDetailsService { |
|---|
| | | |
|---|
| | | void addDownStorageCageDetails(DownStorageCageDetails details); |
|---|
| | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.IService; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCage; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | |
|---|
| | | */ |
|---|
| | | public interface DownStorageCageService extends IService<DownStorageCage> { |
|---|
| | | public List<Map> gettask(); |
|---|
| | | |
|---|
| | | // List<Map<String, Object>> selectCacheLeisure(); |
|---|
| | | List<DownStorageCageDetails> getCacheLeisure(); |
|---|
| | | List<DownStorageCageDetails> getCacheOut(int start, int end); |
|---|
| | | List<Map> getCacheInfo(); |
|---|
| | | List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width); |
|---|
| | | List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width); |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.downstorage.service.impl; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCage; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import com.mes.downstorage.mapper.DownStorageCageDetailsMapper; |
|---|
| | | import com.mes.downstorage.mapper.DownStorageCageMapper; |
|---|
| | | import com.mes.downstorage.service.DownStorageCageDetailsService; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | @Service |
|---|
| | | public class DownStorageCageDetailsServiceImpl extends ServiceImpl<DownStorageCageDetailsMapper, DownStorageCageDetails> implements DownStorageCageDetailsService { |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void addDownStorageCageDetails(DownStorageCageDetails details) { |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | // Other business methods can be implemented here |
|---|
| | | } |
|---|
| | |
|---|
| | | package com.mes.downstorage.service.impl; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCage; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import com.mes.downstorage.mapper.DownStorageCageMapper; |
|---|
| | | import com.mes.downstorage.service.DownStorageCageService; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * <p> |
|---|
| | | * 服务实现类 |
|---|
| | | * 服务实现类 |
|---|
| | | * </p> |
|---|
| | | * |
|---|
| | | * @author zhoush |
|---|
| | | * @since 2024-03-27 |
|---|
| | | */ |
|---|
| | | @Slf4j |
|---|
| | | @Service |
|---|
| | | public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService { |
|---|
| | | @Autowired |
|---|
| | | private DownStorageCageMapper downStorageCageMapper; |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Map> gettask() { |
|---|
| | | public List<Map> gettask(){ |
|---|
| | | downStorageCageMapper.selectList(null); |
|---|
| | | // downStorageCageMapper.selectJoin(); |
|---|
| | | return null; |
|---|
| | | }; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<DownStorageCageDetails> getCacheLeisure() { |
|---|
| | | log.info(" 查询笼子内空闲"); |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList( |
|---|
| | | DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | .select("escd.*") |
|---|
| | | .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | .isNull("escd.slot") |
|---|
| | | .orderByAsc("escd.slot") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | // @Override |
|---|
| | | // public List<Map> getCacheOut(int start, int end) { |
|---|
| | | // log.info(" 根据传入的工位查询符合按照顺序和大小出片的小片"); |
|---|
| | | // List<Map> map = downStorageCageMapper.selectJoinList( |
|---|
| | | // Map.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | // .select("escd.*") |
|---|
| | | // .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | // .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id") |
|---|
| | | // .isNotNull("escd.slot") |
|---|
| | | // .between("dw.workstation_id", start, end) |
|---|
| | | // .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence") |
|---|
| | | // ); |
|---|
| | | // return map; |
|---|
| | | // } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<DownStorageCageDetails> getCacheOut(int start, int end) { |
|---|
| | | log.info("根据传入的工位查询符合按照顺序和大小出片的小片"); |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList( |
|---|
| | | DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | .select("escd.*") |
|---|
| | | .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id") |
|---|
| | | .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ") |
|---|
| | | .isNotNull("escd.slot") |
|---|
| | | .between("dw.workstation_id", start, end) |
|---|
| | | .orderByDesc("escd.width") |
|---|
| | | .orderByDesc("escd.height") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Map> getCacheInfo() { |
|---|
| | | log.info(" 查询笼子内信息"); |
|---|
| | | List<Map> map = downStorageCageMapper.selectJoinList( |
|---|
| | | Map.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | .select("escd.*") |
|---|
| | | .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | .orderByAsc("t.slot") |
|---|
| | | ); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) { |
|---|
| | | log.info(" 查询可进此片玻璃的栅格号 找到相同版图id并且大于前面的顺序的空格"); |
|---|
| | | |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList( |
|---|
| | | DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | .select("escd.*") |
|---|
| | | .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | .isNotNull("escd.slot") |
|---|
| | | .eq("escd.tempering_layout_id", tempering_layout_id) |
|---|
| | | .lt("escd.tempering_feed_sequence", tempering_feed_sequence) |
|---|
| | | .gt("t.remain_width", width) |
|---|
| | | .orderByAsc("escd.tempering_feed_sequence") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) { |
|---|
| | | log.info(" 查询可进此片玻璃的栅格号"); |
|---|
| | | List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList( |
|---|
| | | DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>() |
|---|
| | | .select("escd.*") |
|---|
| | | .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") |
|---|
| | | .isNotNull("escd.slot") |
|---|
| | | .lt("escd.tempering_layout_id", tempering_layout_id) |
|---|
| | | // 条件 t.remain_width - width > 0 |
|---|
| | | .apply("t.remain_width - " + width + " > 0") |
|---|
| | | .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence") |
|---|
| | | ); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | import com.mes.downworkstation.entity.DownWorkstation; |
|---|
| | | import com.mes.downworkstation.service.DownWorkstationService; |
|---|
| | | import com.mes.glassinfo.service.GlassInfoService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.http.HttpStatus; |
|---|
| | | import org.springframework.http.ResponseEntity; |
|---|
| | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * <p> |
|---|
| | | * 前端控制器 |
|---|
| | | * 前端控制器 |
|---|
| | | * </p> |
|---|
| | | * |
|---|
| | | * @author zhoush |
|---|
| | |
|---|
| | | */ |
|---|
| | | |
|---|
| | | @RestController |
|---|
| | | @Api(tags = "工位") |
|---|
| | | @RequestMapping("/api/unLoadGlass") |
|---|
| | | public class DownWorkstationController { |
|---|
| | | |
|---|
| | |
|---|
| | | private DownWorkstationService downWorkstationService; |
|---|
| | | @Autowired |
|---|
| | | private GlassInfoService glassInfoService; |
|---|
| | | |
|---|
| | | @ApiOperation("获取工位信息") |
|---|
| | | @GetMapping("/getone") |
|---|
| | | public ResponseEntity<?> getOneDownWorkstations() { |
|---|
| | | try { |
|---|
| | | List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 5); |
|---|
| | | List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5); |
|---|
| | | // 构建符合预期格式的响应数据 |
|---|
| | | Map<String, Object> responseData = new HashMap<>(); |
|---|
| | | responseData.put("code", 200); |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/gettwo") |
|---|
| | | public List<DownWorkstation> gettwoDownWorkstations() { |
|---|
| | | return downWorkstationService.getoneDownWorkstations(6, 10); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("获取流程卡号") |
|---|
| | | @GetMapping("/getflowCardId") |
|---|
| | | public ResponseEntity<Map<String, Object>> getflowCardId() { |
|---|
| | | Map<String, Object> responseData = new HashMap<>(); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | //绑定架子 |
|---|
| | | |
|---|
| | | //绑定架子 |
|---|
| | | @ApiOperation("绑定架子") |
|---|
| | | @PostMapping("/updateFlowCardId") |
|---|
| | | public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) { |
|---|
| | | // 从 requestData 中获取传入的 flowCardId |
|---|
| | |
|---|
| | | return ResponseEntity.ok(responseData); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("清除工位信息") |
|---|
| | | @PostMapping("/clear") |
|---|
| | | public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) { |
|---|
| | | // 调用 DownWorkstationService 中的方法清除指定工位ID的信息 |
|---|
| | |
|---|
| | | responseData.put("code", 200); |
|---|
| | | // 返回处理结果 |
|---|
| | | return ResponseEntity.ok(responseData); |
|---|
| | | } else { |
|---|
| | | } |
|---|
| | | else { |
|---|
| | | // 如果总数量和落架数量不一致，返回错误响应 |
|---|
| | | Map<String, Object> errorResponse = new HashMap<>(); |
|---|
| | | errorResponse.put("message", "Total workstations count does not match down workstations count."); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | @Service |
|---|
| | | public class DownGlassLogic { |
|---|
| | | @Autowired |
|---|
| | | private DownGlassInfo downGlassInfo; |
|---|
| | | private DownWorkstation downWorkstation; |
|---|
| | | private DownGlassInfoMapper downGlassInfoMapper; |
|---|
| | | |
|---|
| | | |
|---|
| | | private DownGlassInfoService downGlassInfoService; |
|---|
| | | private DownGlassTaskService downGlassTaskService; |
|---|
| | | private DownWorkstationMapper downWorkstationMapper; |
|---|
| | | private DownWorkstationService downWorkstationService; |
|---|
| | | private DownWorkstationTaskService downWorkstationTaskService; |
|---|
| | | PlcParameterObject plcread = PLCAutoMes.PlcReadObject; |
|---|
| | | /** |
|---|
| | | * // 机械手1PLC请求字 |
|---|
| | | */ |
|---|
| | | String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | /** |
|---|
| | | * // 机械手2PLC请求字 |
|---|
| | | */ |
|---|
| | | String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | /** |
|---|
| | | * // 玻璃id |
|---|
| | | */ |
|---|
| | | String glassID = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | String glasswidth = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | String glassheight = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | // |
|---|
| | | String glassthickness = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | String pLcwancheng = plcread.getPlcParameter("A01Position").getValue(); |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * // 存放待处理的玻璃信息 |
|---|
| | | */ |
|---|
| | | private List<DownGlassInfo> glassList; |
|---|
| | | /** |
|---|
| | | * 存放玻璃放置在缓存笼中的详细信息 |
|---|
| | | */ |
|---|
| | | private List<DownStorageCageDetails> cageDetailsList; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * //当下片任务表状态为1时候将数据插入到下片玻璃信息表 |
|---|
| | |
|---|
| | | downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class); |
|---|
| | | downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class); |
|---|
| | | downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class); |
|---|
| | | downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class); |
|---|
| | | downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class); |
|---|
| | | List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState(); |
|---|
| | | // |
|---|
| | |
|---|
| | | |
|---|
| | | downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo); |
|---|
| | | //更新下片任务表状态为0 |
|---|
| | | downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId()); |
|---|
| | | downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId()); |
|---|
| | | |
|---|
| | | sequence++; // 递增顺序字段值 |
|---|
| | | |
|---|
| | |
|---|
| | | //更新下片工位表中已落架数量 |
|---|
| | | downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1); |
|---|
| | | //更新机械任务表中状态为0 |
|---|
| | | downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId()); |
|---|
| | | downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId()); |
|---|
| | | |
|---|
| | | //删除下片任务表中的记录 |
|---|
| | | downGlassTaskService.deleteTask(downWorkstation.getFlowCardId()); |
|---|
| | | downGlassTaskService.deleteTask(downWorkstation.getId()); |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @param downWorkstation // 满架拉走 清除流程卡信息 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | // public void clearFlowCardId(DownWorkstation downWorkstation) { |
|---|
| | | // |
|---|
| | | // downWorkstationMapper.clearFlowCardId(downWorkstation); |
|---|
| | | // } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | public interface DownWorkstationTaskService extends IService<DownWorkstationTask> { |
|---|
| | | void insertdownWorkstationtask(DownGlassInfo downGlassInfo); |
|---|
| | | |
|---|
| | | void updateTaskStateToZero(String flowCardId); |
|---|
| | | void updateTaskStateToZero(long Id); |
|---|
| | | } |
|---|
| | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|---|
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|---|
| | | import com.mes.downglassinfo.entity.DownGlassTask; |
|---|
| | | import com.mes.downworkstation.entity.DownWorkstation; |
|---|
| | | import com.mes.downworkstation.entity.DownWorkstationTask; |
|---|
| | | import com.mes.downworkstation.mapper.DownWorkstationMapper; |
|---|
| | |
|---|
| | | import org.springframework.transaction.annotation.Transactional; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | @Service |
|---|
| | | public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService { |
|---|
| | |
|---|
| | | private DownWorkstationTaskMapper downWorkstationTaskMapper; |
|---|
| | | |
|---|
| | | |
|---|
| | | // @Override |
|---|
| | | |
|---|
| | | // @Override |
|---|
| | | // public List<DownWorkstation> gettwoDownWorkstations() { |
|---|
| | | // return downWorkstationMapper.getDownWorkstationsInRange(6,10); |
|---|
| | | // } |
|---|
| | |
|---|
| | | // return totalQuantity != null ? totalQuantity : 0; |
|---|
| | | // } |
|---|
| | | |
|---|
| | | // @Override |
|---|
| | | // @Override |
|---|
| | | // public int getRacksNumber(int workstationId) { |
|---|
| | | // Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId); |
|---|
| | | // return racksNumber != null ? racksNumber : 0; |
|---|
| | |
|---|
| | | DownWorkstation result = baseMapper.selectOne(queryWrapper); |
|---|
| | | return result != null ? result.getRacksnumber() : 0; |
|---|
| | | } |
|---|
| | | |
|---|
| | | //根据条件获取工位玻璃信息 |
|---|
| | | //根据条件获取工位玻璃信息 |
|---|
| | | @Override |
|---|
| | | public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) { |
|---|
| | | QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>(); |
|---|
| | |
|---|
| | | @Override |
|---|
| | | public void updateracksnumber(String flowCardId, int racksNumber) { |
|---|
| | | UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>(); |
|---|
| | | updateWrapper.set("racks_number", racksNumber).eq("flow_card_id", flowCardId); |
|---|
| | | updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId); |
|---|
| | | baseMapper.update(null, updateWrapper); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Transactional |
|---|
| | | public void crossDatabaseQuery() { |
|---|
| | | // 从 MySQL 数据库中查询数据，只返回一条符合条件的数据 |
|---|
| | |
|---|
| | | // 从 SQL Server 数据库中查询数据 |
|---|
| | | List<DownWorkstationTask> downWorkstationTasks = downWorkstationTaskMapper.selectList(); |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void updateTaskStateToZero(String flowCardId) { |
|---|
| | | public void updateTaskStateToZero(long id) { |
|---|
| | | UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>(); |
|---|
| | | updateWrapper.set("state", 0).eq("flow_card_id", flowCardId); |
|---|
| | | updateWrapper.set("state", 0).eq("id", id); |
|---|
| | | |
|---|
| | | baseMapper.update(null, updateWrapper); |
|---|
| | | } |
|---|
| | |
|---|
| | | username: root |
|---|
| | | password: beibo.123/ |
|---|
| | | driver-class-name: com.mysql.cj.jdbc.Driver |
|---|
| | | salve_hangzhoumes: |
|---|
| | | url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes |
|---|
| | | username: sa |
|---|
| | | password: beibo.123/ |
|---|
| | | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver |
|---|
| | | cloud: |
|---|
| | | nacos: |
|---|
| | | discovery: |
|---|
| | |
|---|
| | | port: 6379 |
|---|
| | | password: 123456 |
|---|
| | | mybatis-plus: |
|---|
| | | mapper-locations: classpath*:mapper/**/*.xml |
|---|
| | | |
|---|
| | | # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl |
|---|
| | | # 设置 MyBatis 日志级别为 ERROR |
|---|
| | | logging: |
|---|
| | | level: |
|---|
| | | com: |
|---|
| | | baomidou: |
|---|
| | | mybatisplus=ERROR: |
|---|
| | | mapper-locations: classpath*:mapper/*.xml |
|---|
| | | configuration: |
|---|
| | | log-impl: org.apache.ibatis.logging.stdout.StdOutImpl |
|---|
| New file |
| | |
|---|
| | | package mes; |
|---|
| | | |
|---|
| | | import com.mes.UnLoadGlassApplication; |
|---|
| | | import com.mes.downstorage.entity.DownStorageCageDetails; |
|---|
| | | import com.mes.downstorage.service.impl.DownStorageCageServiceImpl; |
|---|
| | | |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.junit.Test; |
|---|
| | | import org.junit.runner.RunWith; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.boot.test.context.SpringBootTest; |
|---|
| | | import org.springframework.test.context.junit4.SpringRunner; |
|---|
| | | |
|---|
| | | import java.util.Arrays; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Author : zhoush |
|---|
| | | * @Date: 2024/3/27 16:37 |
|---|
| | | * @Description: |
|---|
| | | */ |
|---|
| | | @Slf4j |
|---|
| | | @RunWith(SpringRunner.class) |
|---|
| | | @SpringBootTest(classes = UnLoadGlassApplication.class) |
|---|
| | | public class UnloadGlassModuleApplicationTest { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | DownStorageCageServiceImpl downStorageCageServiceImpl; |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testFindPath() { |
|---|
| | | log.info("完整路径：{}", Arrays.asList("123")); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testCacheGlass() { |
|---|
| | | List<Map> map= downStorageCageServiceImpl.getCacheInfo(); |
|---|
| | | log.info("笼内信息：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | @Test |
|---|
| | | public void testselectCacheEmpty() { |
|---|
| | | List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheLeisure(); |
|---|
| | | log.info("笼内空格：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Test |
|---|
| | | public void testgetCacheOut() { |
|---|
| | | List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheOut(1,5); |
|---|
| | | log.info("根据传入的工位查询符合按照顺序和大小出片的小片：{}", Arrays.asList(map)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | <artifactId>hangzhoumesParent</artifactId> |
|---|
| | | <groupId>com.mes</groupId> |
|---|
| | | <version>1.0-SNAPSHOT</version> |
|---|
| | | <relativePath>../pom.xml</relativePath> |
|---|
| | | </parent> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | |
|---|
| | |
|---|
| | | <scope>test</scope> |
|---|
| | | </dependency> |
|---|
| | | </dependencies> |
|---|
| | | |
|---|
| | | |
|---|
| | | <build> |
|---|
| | | <plugins> |
|---|
| | | <plugin> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-maven-plugin</artifactId> |
|---|
| | | </plugin> |
|---|
| | | </plugins> |
|---|
| | | </build> |
|---|
| | | </project> |
|---|
| | |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-parent</artifactId> |
|---|
| | | <version>2.1.8.RELEASE</version> |
|---|
| | | <relativePath/> |
|---|
| | | </parent> |
|---|
| | | |
|---|
| | | <properties> |
|---|
