From 9301d31986fb2a59970c665b3a64cbc9e37b086a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 08:45:10 +0800
Subject: [PATCH] 堆垛机调试
---
src/main/webapp/static/wms/js/crnOperate/crnOperate.js | 28 +++++++
src/main/webapp/views/crnOperate/crnOperate.html | 114 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/CrnController.java | 40 ++++++++++
3 files changed, 182 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 1dbe9c2..86949ae 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -207,6 +207,46 @@
return R.ok().add(list);
}
+ @PostMapping("/crn/table/crn/{id}/msg")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
+ public R crnMsgTable(@PathVariable("id") Integer id){
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no"));
+ // 琛ㄦ牸琛�
+ CrnMsgTableVo vo = new CrnMsgTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
+ if (crnThread == null) {
+ return R.error();
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error();
+ }
+
+ vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
+ vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
+ vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
+ }
+ } else {
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ }
+ vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
+ vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
+ vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
+ vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
+ vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
+ vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
+ vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ return R.ok().add(vo);
+ }
+
@PostMapping("/crn/output/site")
@ManagerAuth(memo = "鍫嗗灈鏈烘姤鏂囨棩蹇楄緭鍑�")
public R crnOutput(){
diff --git a/src/main/webapp/static/wms/js/crnOperate/crnOperate.js b/src/main/webapp/static/wms/js/crnOperate/crnOperate.js
index f931f02..057c597 100644
--- a/src/main/webapp/static/wms/js/crnOperate/crnOperate.js
+++ b/src/main/webapp/static/wms/js/crnOperate/crnOperate.js
@@ -40,6 +40,34 @@
}
}
})
+
+ $.ajax({
+ url: baseUrl + "/crn/table/crn/" + crnNo + "/msg",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code == 200) {
+ layer.msg('杩炴帴鎴愬姛')
+ console.log(res)
+ let data = res.data
+ $("#__sourceStaNo").val(data.sourceStaNo)
+ $("#__staNo").val(data.staNo)
+ $("#__sourceLocNo").val(data.sourceLocNo)
+ $("#__locNo").val(data.locNo)
+ $("#xspeed").val(data.xspeed)
+ $("#yspeed").val(data.yspeed)
+ $("#zspeed").val(data.zspeed)
+ $("#xdistance").val(data.xdistance)
+ $("#ydistance").val(data.ydistance)
+ $("#xduration").val(data.xduration)
+ $("#yduration").val(data.yduration)
+ $("#__workNo").val(data.workNo)
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
}
// 鍏ュ簱
diff --git a/src/main/webapp/views/crnOperate/crnOperate.html b/src/main/webapp/views/crnOperate/crnOperate.html
index 9996e13..56a31ea 100644
--- a/src/main/webapp/views/crnOperate/crnOperate.html
+++ b/src/main/webapp/views/crnOperate/crnOperate.html
@@ -240,6 +240,120 @@
</div>
</div>
</div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>婧愮珯</div>
+ <input class="layui-input" id="__sourceStaNo" type="text" disabled />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row" style="margin-top: 20px;">
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鐩爣绔�</div>
+ <input class="layui-input" id="__staNo" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>婧愬簱浣�</div>
+ <input class="layui-input" id="__sourceLocNo" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鐩爣搴撲綅</div>
+ <input class="layui-input" id="__locNo" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>璧拌閫熷害锛坢/min)</div>
+ <input class="layui-input" id="xspeed" type="text" disabled />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row" style="margin-top: 20px;">
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鍗囬檷閫熷害锛坢/min) </div>
+ <input class="layui-input" id="yspeed" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鍙夌墮閫熷害锛坢/min)</div>
+ <input class="layui-input" id="zspeed" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>璧拌璺濈(Km)</div>
+ <input class="layui-input" id="xdistance" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鍗囬檷璺濈(Km) </div>
+ <input class="layui-input" id="ydistance" type="text" disabled />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row" style="margin-top: 20px;">
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>璧拌鏃堕暱(H)</div>
+ <input class="layui-input" id="xduration" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>鍗囬檷鏃堕暱(H)</div>
+ <input class="layui-input" id="yduration" type="text" disabled />
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md3">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <div>宸ヤ綔鍙�</div>
+ <input class="layui-input" id="__workNo" type="text" disabled />
+ </div>
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1