| src/main/java/com/zy/asrs/controller/CrnController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/crnOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/devpOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/rgvOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/CrnController.java
@@ -454,11 +454,11 @@ command.setDestinationPosX(param.getBay()); // 目标库位列 command.setDestinationPosY(param.getLev()); // 目标库位层 command.setCommand((short)1); LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX()) .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ())); LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX()) .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ())); VersionUtils.locMoveCheckLocType(sourceLoc, loc); // LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX()) // .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ())); // LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX()) // .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ())); // VersionUtils.locMoveCheckLocType(sourceLoc, loc); return crnControl(command)?R.ok():R.error(); }
@@ -43,9 +43,9 @@ </div> <div> <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline"> <el-form-item label="源站/源库位"> <el-input v-model="formParam.sourceStaNo" placeholder="源站/源库位"></el-input> </el-form-item> <!-- <el-form-item label="源站/源库位">--> <!-- <el-input v-model="formParam.sourceStaNo" placeholder="源站/源库位"></el-input>--> <!-- </el-form-item>--> <el-form-item label="排"> <el-input v-model="formParam.sourceRow" placeholder="排"></el-input> </el-form-item> @@ -57,9 +57,9 @@ </el-form-item> </el-form> <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline"> <el-form-item label="目标站/目标库位"> <el-input v-model="formParam.staNo" placeholder="目标站/目标库位"></el-input> </el-form-item> <!-- <el-form-item label="目标站/目标库位">--> <!-- <el-input v-model="formParam.staNo" placeholder="目标站/目标库位"></el-input>--> <!-- </el-form-item>--> <el-form-item label="排"> <el-input v-model="formParam.row" placeholder="排"></el-input> </el-form-item> src/main/webapp/views/deviceOperate/devpOperate.html
@@ -62,11 +62,13 @@ </el-form> <div> <el-button @click="requestOperate('update')" type="primary">更新</el-button> <!-- <el-button @click="requestOperate('in')" type="warning">放货完成</el-button>--> </div> <div style="margin-top: 10px"> <el-button @click="requestOperate('pakMk')" type="warning">入库标记复位</el-button> <el-button @click="requestOperate('pakMkRun')" type="warning">退库标记复位</el-button> <el-button @click="requestOperate('pakMkTask')" type="warning">小车任务下发标记复位</el-button> <el-button @click="requestOperate('pakMkWalk')" type="warning">WMS任务下发标记复位</el-button> <!-- <el-button @click="requestOperate('in')" type="warning">放货完成</el-button>--> </div> </div> </el-card> src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -58,8 +58,12 @@ <el-button @click="requestOperate('put')" type="primary">放货</el-button> <el-button @click="requestOperate('TakeAndPut')" type="primary">取放货</el-button> <el-button @click="requestOperate('walk')" type="warning">行走</el-button> </div> <div style="margin-top: 10px"> <el-button @click="requestOperate('del')" type="warning">任务清空</el-button> <el-button @click="requestOperate('del2')" type="warning">清除作业启动中</el-button> </div> <div style="margin-top: 10px"> <el-button @click="requestOperate('delRgvTask')" type="warning">清空wcs下发数据（运行数据需要硬件复位9S）</el-button> </div> </div>
