JiuMuMesParent/.idea/compiler.xml
@@ -11,10 +11,10 @@ <module name="servicebase" /> <module name="deviceInteraction" /> <module name="gateway" /> <module name="cacheGlass" /> </profile> </annotationProcessing> <bytecodeTargetLevel> <module name="cacheGlass" target="1.8" /> <module name="cacheVerticalGlass" target="1.8" /> <module name="glassStorage" target="1.8" /> <module name="loadGlass" target="1.8" /> JiuMuMesParent/.idea/misc.xml
@@ -5,6 +5,7 @@ <option name="originalFiles"> <list> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/common/springsecurity/pom.xml" /> </list> </option> <option name="ignoredFiles"> JiuMuMesParent/.idea/modules.xml
New file @@ -0,0 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/moduleService/CacheGlassModule/cacheGlass.iml" filepath="$PROJECT_DIR$/moduleService/CacheGlassModule/cacheGlass.iml" /> </modules> </component> </project> JiuMuMesParent/moduleService/DeviceInteractionModule/logs/cacheGlass/web_debug.log
JiuMuMesParent/moduleService/DeviceInteractionModule/logs/cacheGlass/web_error.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/cacheGlass/web_info.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/cacheGlass/web_warn.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-error-2024-09-03.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-error-2024-09-04.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-info-2024-09-03.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-info-2024-09-04.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-warn-2024-09-03.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web-warn-2024-09-04.0.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web_debug.log
JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web_error.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web_info.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/logs/deviceInteraction/web_warn.log
File was deleted JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/MachineController.java
@@ -3,6 +3,7 @@ import com.mes.md.entity.Machine; import com.mes.md.entity.Tasking; import com.mes.md.mapper.MachineMapper; import com.mes.md.service.MachineService; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; @@ -23,6 +24,16 @@ @Autowired MachineService machineService; @Autowired MachineMapper machineMapper; @ApiOperation("查询当前设备 数据") @PostMapping("/findMachine") @ResponseBody public Result findMachine(@RequestBody Machine findMachine) { Machine machine =machineMapper.selectById(findMachine); return Result.build(200,"成功",machine); } @ApiOperation("修改当前设备 【开工/暂停】") @PostMapping("/updateMachineState") JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/MachineService.java
@@ -12,6 +12,7 @@ * @since 2024-09-13 */ public interface MachineService extends MPJBaseService<Machine> { /** * @param machine 修改当前设备状态：【开工/暂停】 * @return JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/TaskingModuleApplicationTest.java
File was deleted UI-Project/src/views/Marking/marking.vue
@@ -10,20 +10,36 @@ account: '', password: '', }); const findCraftTaskingData = ref([]); const loadData = ref([]); const findMachine = ref([]); onMounted(async () => { load(); }); //获取数据 const load = async() => { //获取设备任务数据 try { const response = await request.post('/deviceInteraction/tasking/findMachineTask', { "id": 11 }); // 替换为你的API端点 if (response.code === 200) { findCraftTaskingData.value= response.data; loadData.value.findTaskingData= response.data; } else { ElMessage.warning(res.msg) } } catch (error) { // console.error('Error fetching rects :', error); } //获取设备状态 try { const response = await request.post('/deviceInteraction/machine/findMachine', { "id": 11 }); // 替换为你的API端点 if (response.code === 200) { findMachine.value= response.data; } else { ElMessage.warning(res.msg) } @@ -76,15 +92,7 @@ } //开工/暂停 const machineStatus = async(row,state) => { } //破损 const damagedTask = async(row) => { } //下线(拿走) const downLine = async(row,state) => { const machineStatus = async(state) => { ElMessageBox.confirm( t('marking.tips'), t('delivery.prompt'), @@ -96,10 +104,74 @@ ) .then(() => { //下线接口 request.post("/deviceInteraction/tasking/updateDownLine", request.post("/deviceInteraction/machine/updateMachineState", { "id": 11, "state": state }).then((res) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); this.load(); } else { ElMessage.warning(res.message) } }) }) .catch(() => { ElMessage({ type: 'info', message: t('marking.cancel'), }) }) } //破损 const damagedTask = async(row) => { ElMessageBox.confirm( t('marking.tips'), t('delivery.prompt'), { confirmButtonText: t('marking.sure'), cancelButtonText: t('marking.cancel'), type: 'warning', } ) .then(() => { //下线接口 request.post("/deviceInteraction/tasking/damagedTask", { "glassId": row.glassId }).then((res) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); this.load(); } else { ElMessage.warning(res.message) } }) }) .catch(() => { ElMessage({ type: 'info', message: t('marking.cancel'), }) }) } //下线(拿走) const glassDownLine = async(row) => { ElMessageBox.confirm( t('marking.tips'), t('delivery.prompt'), { confirmButtonText: t('marking.sure'), cancelButtonText: t('marking.cancel'), type: 'warning', } ) .then(() => { //下线接口 request.post("/deviceInteraction/tasking/glassDownLine", { "glassId": row.glassId, "state": state }).then((res) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); @@ -131,15 +203,15 @@ <br> <div id="search" style="padding-left: 20px;"> <!-- 功能 --> <el-button type="primary" id="searchButton" @click="machineStatus">开工</el-button> <el-button type="primary" id="searchButton" @click="topLine">上线</el-button> <el-button type="primary" id="ButtonMachineStatus" @click="machineStatus((findMachine['state']=='暂停'?'开工':'暂停'))">{{findMachine['state']=='开工'?'开工':'暂停'}}</el-button> <el-button type="primary" id="ButtonTopLine" @click="topLine">上线</el-button> <!-- <el-button type="primary" id="searchButton" @click="downLine('下线')">下线</el-button> <el-button type="primary" id="searchButton" @click="workStatus('破损')">破损</el-button> <el-button type="primary" id="searchButton" @click="workStatus('完工')">完工</el-button> --> </div> <div id="main-body" style="min-height:240px;"> <!-- 表格内容 --> <el-table :data="findCraftTaskingData" stripe <el-table :data="loadData.findTaskingData" stripe :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"> <!-- <el-table-column type="selection" min-width="30" /> --> @@ -155,8 +227,8 @@ <template #default="scope"> <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '失败')">重发</el-button> <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '完工')">完工</el-button> <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '破损')">破损</el-button> <el-button size="mini" link type="primary" plain @click="downLine(scope.row, '下线')">下线</el-button> <el-button size="mini" link type="primary" plain @click="damagedTask(scope.row)">破损</el-button> <el-button size="mini" link type="primary" plain @click="glassDownLine(scope.row)">下线</el-button> </template> </el-table-column> </el-table> logs/deviceInteraction/web-error-2024-09-04.0.log
File was deleted logs/deviceInteraction/web-info-2024-09-04.0.log
File was deleted logs/deviceInteraction/web-warn-2024-09-04.0.log
File was deleted logs/deviceInteraction/web_debug.log
logs/deviceInteraction/web_error.log
File was deleted logs/deviceInteraction/web_info.log
File was deleted logs/deviceInteraction/web_warn.log
File was deleted
