From 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 09:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/controller/OpenController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0225ee2..3875e7a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -47,8 +47,9 @@
public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
// DecimalFormat df = new DecimalFormat("0000");
// String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
- String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
if (Cools.isEmpty(task)) {
log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
}
@@ -68,19 +69,17 @@
@AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
HashMap<String, Object> map = new HashMap<>();
- String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
if (Cools.isEmpty(task)) {
log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
}
-
- taskService.updateById(task);
if (task.getIoType() < 100 ){
task.setWrkSts(4L);
}else {
task.setWrkSts(14L);
}
-
taskService.updateById(task);
map.put("code","0");
--
Gitblit v1.9.1