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 +++++++++++++++-
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 2 +
src/main/java/com/zy/core/CtuMainProcess.java | 4 +-
src/main/java/com/zy/asrs/domain/param/AskStaParam.java | 33 ++++++++++++++++
4 files changed, 68 insertions(+), 4 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("鐘舵�佷笉瀵�");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/domain/param/AskStaParam.java b/src/main/java/com/zy/asrs/domain/param/AskStaParam.java
new file mode 100644
index 0000000..a861b67
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/AskStaParam.java
@@ -0,0 +1,33 @@
+package com.zy.asrs.domain.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class AskStaParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+
+ /**
+ * 鎬荤嚎
+ */
+ @ApiModelProperty(value = "鎬荤嚎")
+ private Integer askSta;
+
+
+
+ /**
+ * 浠诲姟杩涘害
+ */
+ @ApiModelProperty(value = "浠诲姟杩涘害")
+ private Integer askType;
+
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index 9c94401..bf00720 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -146,6 +146,8 @@
return;
}
if (flag1007 && staProtocol.getWorkNo() > 0 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && staProtocol.isPakMk()) {
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo((short) 0);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
log.info("鍙栬蛋鍐欏叆纭浣嶏細{},{}", staProtocol.getWorkNo(), 1007);
}
diff --git a/src/main/java/com/zy/core/CtuMainProcess.java b/src/main/java/com/zy/core/CtuMainProcess.java
index da7a89b..9f5819d 100644
--- a/src/main/java/com/zy/core/CtuMainProcess.java
+++ b/src/main/java/com/zy/core/CtuMainProcess.java
@@ -50,7 +50,7 @@
ctuMainService.out(2);
- // 鍑哄簱
+ // 灏忚溅鍙栧畬璐э紝閫氱煡plc
ctuMainService.outToPlc(6);
// 101-108鎸夐挳鍏ュ簱
@@ -62,7 +62,7 @@
//1007鑷姩鍏�
//ctuMainService.autoIn(5);
- ctuMainService.updateSta(6);
+ //ctuMainService.updateSta(6);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1