From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..b8c4443 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -26,6 +26,7 @@
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
@@ -33,6 +34,7 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
@@ -92,6 +94,29 @@
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
+ @PostMapping("/site/pickIn")
+// @ManagerAuth(memo = "鐩樼偣鍐嶅叆搴�")
+ public R sitePickIn(@RequestParam Integer siteId, @RequestParam Integer workNo) throws InterruptedException {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta inSta : devp.getPickSta()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setSiteId(siteId);
+ staProtocol.setStaNo((short) 999);
+ if(MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))){
+ return R.ok();
+ }
+ }
+ }
+ return R.error("鍏ュ簱澶辫触锛岃妫�鏌ョ珯鐐逛互鍙婂伐浣滄。淇℃伅");
+ }
+
/****************************************************************/
/************************** 瀹炴椂鏁版嵁 ******************************/
/****************************************************************/
@@ -149,6 +174,12 @@
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
+ if(crnProtocol.getAlarm() == 10){
+ crnProtocol.setAlarm((short) 0);
+ }
+ if(crnProtocol.getAlarm() == 6){
+ crnProtocol.setAlarm((short) 0);
+ }
if (crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
--
Gitblit v1.9.1