From 01ba9dad3e284f390224151b510894a776ec4267 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 08:14:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index fed6c93..4d1454e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,14 +8,17 @@
import com.zy.asrs.domain.param.*;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.annotations.OpenApiLog;
import com.zy.common.service.CommonService;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatcher.ShuttleDispatchUtils;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.WrkIoType;
import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.protocol.ForkLiftProtocol;
@@ -49,6 +52,8 @@
private ApiLogService apiLogService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
@PostMapping("/createMoveTask")
@OpenApiLog(memo = "灏忚溅绉诲姩浠诲姟")
@@ -112,7 +117,7 @@
//鍏ュ簱浠诲姟
@PostMapping("/createInTask")
@OpenApiLog(memo = "鍏ュ簱浠诲姟")
- public R createInTask(@RequestBody CreateInTaskParam param) {
+ public synchronized R createInTask(@RequestBody CreateInTaskParam param) {
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
@@ -142,7 +147,7 @@
//鍑哄簱浠诲姟
@PostMapping("/createOutTask")
@OpenApiLog(memo = "鍑哄簱浠诲姟")
- public R createOutTask(@RequestBody CreateOutTaskParam param) {
+ public synchronized R createOutTask(@RequestBody CreateOutTaskParam param) {
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
@@ -337,8 +342,8 @@
apiLogService.insert(new ApiLog(
null
- , "鑾峰彇鎸囧畾搴撲綅淇℃伅"
- , "/getLocInformation"
+ , "鑾峰彇鍏ㄩ儴搴撲綅淇℃伅"
+ , "/getAllLocInformation"
, null
, null
, null
@@ -362,8 +367,8 @@
apiLogService.insert(new ApiLog(
null
- , "鑾峰彇鎸囧畾搴撲綅淇℃伅"
- , "/getLocInformation"
+ , "灏忚溅闆嗗悎"
+ , "/shuttleGather"
, null
, null
, null
@@ -380,6 +385,42 @@
return R.ok().add(shuttleGather);
}
+ @PostMapping("/queryTask")
+ @OpenApiLog(memo = "鏌ヨ浠诲姟")
+ public R queryTask(@RequestBody QueryTaskParam param) {
+ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ if(param.getTaskNo() != null) {
+ wrapper.eq("wms_wrk_no", param.getTaskNo());
+ }
+
+ if(param.getTaskType() != null) {
+ WrkIoType ioType = WrkIoType.get(param.getTaskType());
+ if(ioType == null) {
+ return R.error("浠诲姟绫诲瀷涓嶅瓨鍦�");
+ }
+ wrapper.eq("io_type", ioType.id);
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(wrapper);
+ apiLogService.insert(new ApiLog(
+ null
+ , "鏌ヨ浠诲姟"
+ , "/queryTask"
+ , null
+ , null
+ , null
+ , null
+ , JSON.toJSONString(wrkMasts)
+ , null
+ , null
+ , 1
+ , new Date()
+ , null
+ , null
+ ));
+
+ return R.ok().add(wrkMasts);
+ }
+
@GetMapping("/test")
public R test() {
notifyUtils.notify("task", 1, "9999", "W9999", NotifyMsgType.SHUTTLE_MOVING, "data");
--
Gitblit v1.9.1