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 | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 168562a..b8c4443 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
@@ -11,28 +14,33 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
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;
import com.zy.core.enums.SlaveType;
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;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.MelsecCrnThread;
-import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +66,8 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private BasRgvService basRgvService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -84,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("鍏ュ簱澶辫触锛岃妫�鏌ョ珯鐐逛互鍙婂伐浣滄。淇℃伅");
+ }
+
/****************************************************************/
/************************** 瀹炴椂鏁版嵁 ******************************/
/****************************************************************/
@@ -99,12 +132,19 @@
stations.putAll(devpThread.getStation());
}
}
+ List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
SiteLatestDataVo vo = new SiteLatestDataVo();
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
+ for (BasRgv basRgv: basRgvs){
+ if (basRgv.getRgvNo().equals(entry.getKey()) ){
+ staProtocol.setWorkNo(basRgv.getWrkNo1());
+ }
+ }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
}
return R.ok().add(vos);
@@ -134,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 {
@@ -246,7 +292,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -292,15 +338,16 @@
@GetMapping("/barcode/output/site")
public R crnOutput(){
-// StringBuilder str = new StringBuilder();
-// String s;
-// int i = 0;
-// while((s = OutputQueue.CRN.poll()) != null && i <=32) {
-// str.append("\n").append(s);
-// i++;
-// }
-// return R.ok().add(str.toString());
- return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
+ jsonObjects.sort(new Comparator<JSONObject>() {
+ @Override
+ public int compare(JSONObject o1, JSONObject o2) {
+ Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ return (int) (o2Time.getTime() - o1Time.getTime());
+ }
+ });
+ return R.ok().add(JSON.toJSONString(jsonObjects));
}
}
--
Gitblit v1.9.1