| src/main/java/com/zy/asrs/controller/TaskWrkController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/web/BaseController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/taskWrk/taskWrk.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/taskWrkLog/taskWrkLog.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -108,6 +108,22 @@ if (taskWrk1 == null) { return R.error(); } if ((taskWrk1.getIoType() == 1 || taskWrk1.getIoType() == 3) && taskWrk1.getWrkSts() >= 3 ){ return R.error("任务已在执行，无法修改"); } if ((taskWrk1.getIoType() == 2 ) && taskWrk1.getWrkSts() >= 12 ){ return R.error("任务已在执行，无法修改"); } if (Cools.isEmpty(taskWrk1.getStartPoint()) || Cools.isEmpty(taskWrk1.getTargetPoint())){ return R.error("任务未分配库位，无法修改"); } List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo()); if (!Cools.isEmpty(commandInfos)){ for (CommandInfo commandInfo:commandInfos){ commandInfoService.deleteById(commandInfo); } } InetAddress localHost = InetAddress.getLocalHost(); String ipAddress = localHost.getHostAddress(); @@ -124,6 +140,7 @@ taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint())); taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint())); } taskWrk1.setStatus(1); taskWrk1.setModiTime(new Date()); taskWrk1.setModiUser(getUserId());
@@ -357,6 +357,8 @@ } else if (taskWrk.getIoType() == 2) { taskWrk.setWrkSts(14); } Date now = new Date(); taskWrk.setCompleteTime(now); if (!taskWrkService.updateById(taskWrk)){ log.error(taskWrk.getTaskNo()+ " 堆垛机任务完成，改变任务状态失败"); } @@ -464,6 +466,7 @@ log.error("进入修改工作档流程"); Date now = new Date(); taskWrk.setWrkSts(3); taskWrk.setExecuteTime(now); taskWrk.setModiTime(now); if (taskWrkMapper.updateById(taskWrk) == 0) { log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", taskWrk.getWrkNo()); @@ -642,6 +645,7 @@ // 修改工作档状态 11.生成出库ID => 12.吊车出库中 Date now = new Date(); taskWrk.setWrkSts(12); taskWrk.setExecuteTime(now); taskWrk.setModiTime(now); if (taskWrkMapper.updateById(taskWrk) == 0) { log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo()); @@ -833,6 +837,8 @@ } else if (taskWrk.getIoType() == 2) { taskWrk.setWrkSts(14); } Date now = new Date(); taskWrk.setCompleteTime(now); if (!taskWrkService.updateById(taskWrk)){ log.error(taskWrk.getTaskNo()+ " 堆垛机任务完成，改变任务状态失败"); } src/main/java/com/zy/common/web/BaseController.java
@@ -37,6 +37,11 @@ protected User getUser(){ User user = userService.selectById(getUserId()); if (null == user) { if (getUserId() == 9527){ User user1 = new User(); user1.setUsername("super"); return user1; } throw new CoolException(BaseRes.DENIED); } return user; src/main/webapp/views/taskWrk/taskWrk.html
@@ -28,6 +28,13 @@ <el-option label="取消" value="4"></el-option> </el-select> </el-form-item> <el-form-item label=""> <el-select v-model="tableSearchParam.io_type" placeholder="任务类型"> <el-option label="入库" value="1"></el-option> <el-option label="出库" value="2"></el-option> <el-option label="移库" value="3"></el-option> </el-select> </el-form-item> <el-form-item style="width: 100px;" label=""> <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input> </el-form-item> @@ -51,7 +58,7 @@ </el-form> <el-table border ref="singleTable" :data="tableData" style="width: 100%;"> <el-table-column sortable align="center" property="taskNo" label="任务号" width="90"> <el-table-column fixed="left" sortable align="center" property="taskNo" label="任务号" width="90"> </el-table-column> <el-table-column sortable align="center" property="status$" label="任务状态" width="110"> </el-table-column> @@ -67,7 +74,7 @@ </el-table-column> <el-table-column sortable align="center" property="targetPoint" label="终点位置"> </el-table-column> <el-table-column sortable align="center" property="wrkSts$" label="工作状态"> <el-table-column sortable align="center" property="wrkSts$" label="工作状态" width="150"> </el-table-column> <el-table-column sortable align="center" property="barcode" label="托盘码"> </el-table-column> @@ -75,7 +82,12 @@ </el-table-column> <el-table-column sortable align="center" property="ioPri$" label="优先级"> </el-table-column> <el-table-column label="操作" width="100" align="center"> <el-table-column sortable align="center" property="executeTime$" label="堆垛机开始执行时间"> </el-table-column> <el-table-column sortable align="center" property="completeTime$" label="堆垛机结束执行时间"> </el-table-column> <el-table-column fixed="right" label="操作" width="100" align="center"> <template slot-scope="scope"> <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}"> <el-button icon="el-icon-more" size="mini" type="primary"></el-button> @@ -102,7 +114,7 @@ </el-card> </div> <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible"> <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible" :before-close="handleClose"> <el-form :model="taskWrkForm"> <el-form-item label="起点位置" :label-width="taskWrkFormLabelWidth"> <el-input v-model="taskWrkForm.startPoint" autocomplete="off"></el-input> @@ -147,6 +159,46 @@ this.init() }, methods: { handleClose(done) { this.$confirm('确认关闭？') .then(_ => { done(); }) .catch(_ => {}); }, taskWrkFormConfirm() { //修改指定任务数据 let that = this $.ajax({ url: baseUrl + "/taskWrk/updatePoint/auth", headers: { 'token': localStorage.getItem('token') }, data: { taskNo: this.taskWrkForm.taskNo, startPoint: this.taskWrkForm.startPoint, targetPoint: this.taskWrkForm.targetPoint, }, method: 'POST', success: function(res) { if (res.code == 200) { that.taskWrkFormVisible = false that.$message({ message: "更新成功", type: 'success' }); that.getTableData() } else if (res.code === 403) { top.location.href = baseUrl + "/"; } else { that.$message({ message: res.msg, type: 'error' }); } } }); }, init() { let taskNo = getQueryVariable('taskNo') let wrkNo = getQueryVariable('wrkNo') @@ -409,39 +461,7 @@ } }); }, taskWrkFormConfirm() { //修改指定任务数据 let that = this $.ajax({ url: baseUrl + "/taskWrk/updatePoint/auth", headers: { 'token': localStorage.getItem('token') }, data: { taskNo: this.taskWrkForm.taskNo, startPoint: this.taskWrkForm.startPoint, targetPoint: this.taskWrkForm.targetPoint, }, method: 'POST', success: function(res) { if (res.code == 200) { that.taskWrkFormVisible = false that.$message({ message: "更新成功", type: 'success' }); that.getTableData() } else if (res.code === 403) { top.location.href = baseUrl + "/"; } else { that.$message({ message: res.msg, type: 'error' }); } } }); } } }) </script> src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -17,11 +17,39 @@ <div style="width: 100%;"> <el-card class="box-card"> <el-form :inline="true" :model="tableSearchParam" class="demo-form-inline"> <el-form-item label=""> <el-form-item style="width: 100px;" label=""> <el-input v-model="tableSearchParam.task_no" placeholder="任务号"></el-input> </el-form-item> <el-form-item label=""> <el-form-item style="width: 100px;" label=""> <el-select v-model="tableSearchParam.status" placeholder="状态"> <el-option label="接收" value="1"></el-option> <el-option label="派发" value="2"></el-option> <el-option label="完结" value="3"></el-option> <el-option label="取消" value="4"></el-option> </el-select> </el-form-item> <el-form-item label=""> <el-select v-model="tableSearchParam.io_type" placeholder="任务类型"> <el-option label="入库" value="1"></el-option> <el-option label="出库" value="2"></el-option> <el-option label="移库" value="3"></el-option> </el-select> </el-form-item> <el-form-item style="width: 100px;" label=""> <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input> </el-form-item> <el-form-item label=""> <el-input v-model="tableSearchParam.barcode" placeholder="托盘码"></el-input> </el-form-item> <el-form-item label=""> <el-date-picker v-model="tableSearchParam.datetime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" @click="getTableData">查询</el-button> @@ -109,9 +137,13 @@ }, getTableData() { let that = this; let data = this.tableSearchParam let data = JSON.parse(JSON.stringify(this.tableSearchParam)) data.curr = this.currentPage data.limit = this.pageSize if (this.tableSearchParam.datetime != null) { data.datetime = null data.create_time = this.tableSearchParam.datetime[0] + " - " + this.tableSearchParam.datetime[1] } $.ajax({ url: baseUrl + "/taskWrkLog/list/auth", headers: {
