From df6b5b580886b33bf2586a72beb5008b3b2e7f9a Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期三, 02 七月 2025 09:56:20 +0800 Subject: [PATCH] #改造 --- src/main/webapp/views/deviceOperate/devpOperate.html | 4 +++- src/main/java/com/zy/asrs/controller/CrnController.java | 10 +++++----- src/main/webapp/views/deviceOperate/crnOperate.html | 12 ++++++------ src/main/webapp/views/deviceOperate/rgvOperate.html | 4 ++++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index 688fed8..573b31f 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/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(); } diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html index 769a390..4c8ffad 100644 --- a/src/main/webapp/views/deviceOperate/crnOperate.html +++ b/src/main/webapp/views/deviceOperate/crnOperate.html @@ -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> diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html index cf2edc2..b742f38 100644 --- a/src/main/webapp/views/deviceOperate/devpOperate.html +++ b/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> diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html index 27c2c4c..4983367 100644 --- a/src/main/webapp/views/deviceOperate/rgvOperate.html +++ b/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> -- Gitblit v1.9.1