From 1937b401e9a0b2d3863cea2e9fd87405195ec738 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 24 十月 2025 14:29:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasAgvMastController.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 26 ++++++
src/main/webapp/views/basAgvMast/basAgvMast.html | 124 +++++++++++++++++--------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++
src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java | 16 ++++
src/main/java/com/zy/asrs/service/OpenService.java | 1
src/main/resources/application.yml | 4
src/main/webapp/static/js/basAgvMast/basAgvMast.js | 35 ++++----
8 files changed, 148 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
index 21aed78..f210422 100644
--- a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -43,6 +42,7 @@
convert(param, wrapper);
allLike(BasAgvMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("modi_time",false);
return R.ok(basAgvMastService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d69c327..cff1c14 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -400,4 +400,30 @@
return R.ok().add(taskArmWorkOrderSign);
}
+
+ /**
+ * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+ */
+ @PostMapping("/agv/task/v1")
+ @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
+ public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskAgvReportParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("WMS浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+// if (Cools.isEmpty(param.getTimestamp())) {
+// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
+// }
+ boolean taskAgvReport = openService.TaskAgvReport(param);
+ if (taskAgvReport){
+ return R.ok();
+ }
+ return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java b/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
new file mode 100644
index 0000000..1a80e00
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class TaskAgvReportParam {
+ //WMS浠诲姟鍙�
+ private int taskNo;
+ //RGV浠诲姟鍙�
+ private Long timestamp;
+ //
+ private int status;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 8cc84cc..8083759 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -49,4 +49,5 @@
void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param);
void taskArmWorkOrderStatus(OrderArmEndParam param);
boolean TaskArmWorkOrderSign(OrderArmEndParam param);
+ boolean TaskAgvReport(TaskAgvReportParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c2a3112..d64ca23 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -58,6 +58,8 @@
private BasArmMastService basArmMastService;
@Autowired
private BasArmMastSignService basArmMastSignService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Override
@Transactional
@@ -743,4 +745,17 @@
return true;
}
+ @Override
+ @Transactional
+ public boolean TaskAgvReport(TaskAgvReportParam param) {
+ BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
+ if (Cools.isEmpty(basAgvMast)){
+ return false;
+ }
+ basAgvMast.setStatus(2);
+ basAgvMastService.updateById(basAgvMast);
+ return true;
+ }
+
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 53cb1df..8e74a7a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,8 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
-# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/basAgvMast/basAgvMast.js b/src/main/webapp/static/js/basAgvMast/basAgvMast.js
index 59f5208..9eabd72 100644
--- a/src/main/webapp/static/js/basAgvMast/basAgvMast.js
+++ b/src/main/webapp/static/js/basAgvMast/basAgvMast.js
@@ -21,22 +21,25 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�'}
- ,{field: 'timestamp', align: 'center',title: 'RGV浠诲姟鍙�'}
- ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯鐐�'}
- ,{field: 'staNo', align: 'center',title: '鐩殑绔欑偣'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩殑搴撲綅'}
- ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'floorNo', align: 'center',title: '妤煎眰'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'errorTime$', align: 'center',title: '寮傚父鏃堕棿'}
- ,{field: 'errorMemo', align: 'center',title: '寮傚父淇℃伅'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ // {type: 'checkbox'}
+ // ,
+ {field: 'id', align: 'center',title: 'ID',hide: true}
+ ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�',hide: false}
+ ,{field: 'timestamp', align: 'center',title: 'RGV浠诲姟鍙�',hide: false}
+ ,{field: 'ioType', align: 'center',title: '浠诲姟绫诲瀷',hide: false}
+ ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯鐐�',hide: false}
+ ,{field: 'staNo', align: 'center',title: '鐩殑绔欑偣',hide: false}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�',hide: false}
+ ,{field: 'locNo', align: 'center',title: '鐩殑搴撲綅',hide: false}
+ ,{field: 'priority', align: 'center',title: '浼樺厛绾�',hide: true}
+ ,{field: 'floorNo', align: 'center',title: '妤煎眰',hide: false}
+ ,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: false}
+ ,{field: 'errorTime$', align: 'center',title: '寮傚父鏃堕棿',hide: true}
+ ,{field: 'errorMemo', align: 'center',title: '寮傚父淇℃伅',hide: false}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'devpId', align: 'center',title: '杈撻�丳LCId',hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/basAgvMast/basAgvMast.html b/src/main/webapp/views/basAgvMast/basAgvMast.html
index 0eb2395..0554816 100644
--- a/src/main/webapp/views/basAgvMast/basAgvMast.html
+++ b/src/main/webapp/views/basAgvMast/basAgvMast.html
@@ -72,18 +72,18 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">WMS浠诲姟鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">RGV浠诲姟鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="timestamp" placeholder="璇疯緭鍏GV浠诲姟鍙�">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">WMS浠诲姟鍙�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">RGV浠诲姟鍙�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="timestamp" placeholder="璇疯緭鍏GV浠诲姟鍙�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">婧愮珯鐐�: </label>
<div class="layui-input-block">
@@ -108,16 +108,28 @@
<input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鐨勫簱浣�">
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">浼樺厛绾�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">妤煎眰: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="floorNo" placeholder="璇疯緭鍏ユゼ灞�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">浼樺厛绾�: </label>
+ <label class="layui-form-label">浠诲姟绫诲瀷: </label>
<div class="layui-input-block">
- <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">妤煎眰: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="floorNo" placeholder="璇疯緭鍏ユゼ灞�">
+ <select name="status">
+ <option value="">璇烽�夋嫨</option>
+ <option value="0">AGV搴撲綅==銆嬭緭閫佺珯鐐�</option>
+ <option value="1">AGV搴撲綅==銆婣GV搴撲綅</option>
+ <option value="2">杈撻�佺珯鐐�==銆婣GV搴撲綅</option>
+ <option value="3">杈撻�佺珯鐐�==銆嬭緭閫佺珯鐐�</option>
+ </select>
</div>
</div>
<div class="layui-form-item">
@@ -131,42 +143,42 @@
</select>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">寮傚父鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏ュ紓甯告椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">寮傚父淇℃伅: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="errorMemo" placeholder="璇疯緭鍏ュ紓甯镐俊鎭�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">寮傚父鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏ュ紓甯告椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">寮傚父淇℃伅: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="errorMemo" placeholder="璇疯緭鍏ュ紓甯镐俊鎭�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">淇敼浜哄憳: </label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">-->
+<!-- <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1