From 0fdc564dfcc46dcf50f1c3cc916b5cf17bae92e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 25 十二月 2025 18:34:36 +0800
Subject: [PATCH] 1.rcs请求wcs放货申请 2.wcs反馈rcs继续执行 3.rcs放货完成,已退出输送线,反馈end到wcs 4.rcs请求wcs取货申请 5.wcs反馈rcs继续执行 6.rcs取货完成,已退出输送线,重置站点工作号和目标站
---
src/main/java/com/zy/asrs/controller/OpenController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 90d2e08..b0c8856 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,6 +2,9 @@
import com.core.common.R;
import com.zy.asrs.domain.param.ToOutStaParam;
+import com.zy.asrs.entity.RcsReporterTask;
+import com.zy.asrs.entity.RcsReturn;
+import com.zy.asrs.service.RcsService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -9,6 +12,8 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -16,9 +21,12 @@
@Slf4j
@RestController
public class OpenController {
+ @Autowired
+ private RcsService rcsService;
@RequestMapping("/open/toOutSta")
public R toOutSta(@RequestBody ToOutStaParam param) {
+ log.info("toOutSta:{}",param);
Integer sourceStaNo = param.getSourceStaNo();
SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
if(siemensDevpThread == null) {
@@ -40,8 +48,17 @@
staProtocol.setWorkNo(param.getWrkNo().shortValue());
staProtocol.setStaNo(param.getStaNo().shortValue());
+ staProtocol.setPalletSize((short) 1);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ log.info("鍙戠敓鎴愬姛:{}",result);
return R.ok().add(result);
}
+ // 鍙嶉浠诲姟鎵ц缁撴灉
+ @PostMapping("/api/robot/reporter/task")
+ public RcsReturn reporterTask(@RequestBody RcsReporterTask param){
+
+ return rcsService.reporterTask(param);
+ }
+
}
--
Gitblit v1.9.1