From 3688a0c6f14ab36966fa36866eeab7b812f37b70 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 14:05:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f022fd8..7a62014 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,10 +1,15 @@
package com.zy.asrs.controller;
import com.core.common.R;
+import com.zy.asrs.domain.param.AskStaParam;
import com.zy.asrs.domain.param.TaskReportParam;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.impl.CtuMainServiceImpl;
import com.zy.common.web.BaseController;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+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.beans.factory.annotation.Value;
@@ -74,15 +79,39 @@
if (param == null || param.getSeqNum() == null || param.getQrCode() == null) {
return R.error("鍙傛暟涓虹┖");
}
- if (param.getQrCode().equals("1547")) {
+ if (param.getQrCode().equals("00001547") && param.getTaskSts() == 10) {
log.info("1001浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
ctuMainService.setFlag1001(true);
- } else if (param.getQrCode().equals("1612")) {
+ } else if (param.getQrCode().equals("00001612") && param.getTaskSts() == 5) {
log.info("1007浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
ctuMainService.setFlag1007(true);
}
return R.ok();
}
+ /**
+ * 浠诲姟鐘舵�佷笂鎶ユ帴鏀�
+ */
+ @RequestMapping("/sta/ask/v1")
+ public R taskSync(@RequestBody AskStaParam param) {
+ if (param == null || param.getAskSta() == null || param.getAskType() == null) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(param.getAskSta());
+ if (staProtocol != null) {
+ if (param.getAskType() == 1) {
+ if (staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isOutEnable()) {
+ return R.ok();
+ }
+ } else if (param.getAskType() == 2) {
+ if (!staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()) {
+ return R.ok();
+ }
+ }
+ }
+ return R.error("鐘舵�佷笉瀵�");
+ }
+
}
--
Gitblit v1.9.1