From e466acffabd3cba968bd5c6cbc89de8c5eedb38a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 08 三月 2026 19:29:13 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OpenController.java | 25 ++++++++++++++++++-------
1 files changed, 18 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..9fff8ad 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -47,8 +48,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 +70,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");
@@ -107,6 +107,17 @@
return R.ok();
}
+
+ @PostMapping("/queryTask")
+ @ApiOperation("浠诲姟鎵ц淇℃伅鏌ヨ")
+ public synchronized R queryTaskInfo(@RequestBody TvQueryParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return openService.queryTaskInfo(param);
+
+ }
+
@PostMapping("/order/matSync/default/v1")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
--
Gitblit v1.9.1