From 26419bf11ec888de7af9141a0ac1874065775e61 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 13:59:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RobotController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RobotController.java b/src/main/java/com/zy/asrs/controller/RobotController.java
index 49b74fe..4977a54 100644
--- a/src/main/java/com/zy/asrs/controller/RobotController.java
+++ b/src/main/java/com/zy/asrs/controller/RobotController.java
@@ -2,7 +2,19 @@
import com.zy.asrs.domain.param.RobotReportActionStatusParam;
import com.zy.asrs.domain.param.ReportExceptionParam;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.common.utils.RobotUtils;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -11,6 +23,11 @@
@RestController
public class RobotController {
+
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private SlaveProperties slaveProperties;
//鏈烘鎵嬪悜WCS鍥炴姤浠诲姟缁撴灉瀹屾垚
@PostMapping("/request/wcs/report_task_status")
@@ -21,6 +38,24 @@
Integer pickNum = param.getPick_num();
Integer targetNum = param.getTarget_num();
String message = param.getMessage();
+ Integer staNo = param.getFrom_ws();//鐩爣绔�
+
+ //缁欑洰鏍囩珯鍐欏叆鍑哄簱绔�344
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);//鏈烘鎵嬭噦鎷ｆ枡绔�
+ staProtocol = staProtocol.clone();
+ staProtocol.setStaNo((short) 344);//绌烘墭鐩樺嚭搴撶珯
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ //鏇存柊宸ヤ綔妗� => 29.鍑哄簱瀹屾垚
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo(Integer.valueOf(taskId));
+ if (wrkMast != null && wrkMast.getWrkSts() == 25) {
+ wrkMast.setWrkSts(29L);
+ wrkMastMapper.updateById(wrkMast);
+ }
+ }
System.out.println(param);
map.put("error", 0);
@@ -43,4 +78,14 @@
return map;
}
+ @GetMapping("/test")
+ public void test() {
+ boolean systemStatus = RobotUtils.getSystemStatus();
+ }
+
+ @GetMapping("/test2")
+ public void test2() {
+ RobotUtils.sendTask("9994", 4, "317");
+ }
+
}
--
Gitblit v1.9.1