From 13f3721a678782cfa042acca5208644e8f32dcfb Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 14 四月 2025 16:55:26 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 835f7be..7dbab85 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,18 +1,28 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
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;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
+import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
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.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
@@ -23,14 +33,11 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.MelsecCrnThread;
+import com.zy.core.thread.ScaleThread;
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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -49,6 +56,10 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private LocMastMapper locMastMapper;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -70,7 +81,7 @@
return R.error("鍙ｄ护閿欒");
}
}
- Thread.sleep(2000L);
+ Thread.sleep(200L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -96,6 +107,7 @@
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
}
return R.ok().add(vos);
@@ -109,27 +121,35 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
if (crnThread == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
continue;
}
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
continue;
}
CrnLatestDataVo vo = new CrnLatestDataVo();
vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+
+// Short totalBay = locMastMapper.selectTotalBay();
+
vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
- if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
- }
+ if (crnProtocol.getAlarm() > 0) {
+ vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
}
vos.add(vo);
@@ -143,9 +163,29 @@
List<BarcodeDataVo> list = new ArrayList<>();
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
+ if (null == barcodeThread) {
+ continue;
+ }
BarcodeDataVo vo = new BarcodeDataVo();
vo.setBarcodeId(barcode.getId());
vo.setCodeValue(barcodeThread.getBarcode());
+ list.add(vo);
+ }
+ return R.ok().add(list);
+ }
+
+ @PostMapping("/latest/data/scale")
+ @ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
+ public R scaleLatestData(){
+ List<ScaleDataVo> list = new ArrayList<>();
+ for (Slave scale : slaveProperties.getScale()) {
+ ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, scale.getId());
+ if (null == scaleThread) {
+ continue;
+ }
+ ScaleDataVo vo = new ScaleDataVo();
+ vo.setScaleId(scale.getId());
+ vo.setValue(String.valueOf(Arith.multiplys(1, scaleThread.getScale(), 1)));
list.add(vo);
}
return R.ok().add(list);
@@ -209,10 +249,17 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
+ }
+
if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
@@ -246,4 +293,18 @@
return R.ok();
}
+ @GetMapping("/barcode/output/site")
+ public R crnOutput(){
+ 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