From 45a87642e46c746802af13bf47bcd70e3b69277a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 16:49:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 320 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 1dbe9c2..eb9a0dd 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -11,6 +10,7 @@
import com.zy.asrs.domain.param.CrnDemoParam;
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.domain.vo.CommandLogVo;
+import com.zy.asrs.domain.vo.CrnListVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.*;
@@ -19,6 +19,7 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -35,8 +36,10 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -49,6 +52,13 @@
@Slf4j
@RestController
public class CrnController {
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.movePath}")
+ private String movePath;
+
+
@Autowired
private SlaveProperties slaveProperties;
@@ -121,8 +131,8 @@
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
- if (crnProtocol.getAlarm1() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
}
@@ -207,6 +217,107 @@
return R.ok().add(list);
}
+ @PostMapping("/crn/table/crn/{id}/msg")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
+ public R crnMsgTable(@PathVariable("id") Integer id){
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no"));
+ // 琛ㄦ牸琛�
+ CrnMsgTableVo vo = new CrnMsgTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
+ if (crnThread == null) {
+ return R.error();
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error();
+ }
+
+ vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
+ vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
+ vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
+ }
+ } else {
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ }
+ vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
+ vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
+ vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
+ vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
+ vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
+ vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
+ vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ return R.ok().add(vo);
+ }
+
+ @GetMapping("/crn/list/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
+ public R crnList(){
+ List<CrnListVo> list = new ArrayList<>();
+ List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ for (BasCrnp basCrnp : crnps) {
+ // 琛ㄦ牸琛�
+ CrnListVo vo = new CrnListVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ list.add(vo);
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
+ if (crnThread == null) {
+ continue;
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+
+ vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
+ vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
+ vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
+ }
+ } else {
+ vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ }
+ vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
+ vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
+ vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
+ vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
+ vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
+ vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
+ vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+
+ vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
+ vo.setWrkStatus(crnProtocol.getStatusType().id); // 浠诲姟鐘舵��
+ vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿
+ vo.setBay(crnProtocol.getBay()); // 鍒�
+ vo.setLev(crnProtocol.getLevel()); // 灞�
+
+ vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
+ vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+ vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
+ if (crnProtocol.getAlarm1() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+ vo.setInEnable(basCrnp.getInEnable());
+ vo.setOutEnable(basCrnp.getOutEnable());
+ }
+ return R.ok().add(list);
+ }
+
@PostMapping("/crn/output/site")
@ManagerAuth(memo = "鍫嗗灈鏈烘姤鏂囨棩蹇楄緭鍑�")
public R crnOutput(){
@@ -265,51 +376,65 @@
@ManagerAuth(memo = "鍏ュ簱")
@PostMapping("/crn/operator/put")
public R crnPut(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
return crnControl(command)?R.ok():R.error();
}
@ManagerAuth(memo = "鍑哄簱")
@PostMapping("/crn/operator/take")
public R crnTake(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@ManagerAuth(memo = "搴撲綅杞Щ")
@PostMapping("/crn/operator/stockMove")
public R crnStockMove(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
@@ -321,6 +446,10 @@
@ManagerAuth(memo = "绔欏埌绔�")
@PostMapping("/crn/operator/siteMove")
public R crnSiteMove(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -338,6 +467,10 @@
@ManagerAuth(memo = "鍥炲師鐐�")
@PostMapping("/crn/operator/bacOrigin")
public R crnBacOrigin(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -355,6 +488,10 @@
@ManagerAuth(memo = "鍙嶅師鐐�")
@PostMapping("/crn/operator/reverseOrigin")
public R reverseOrigin(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -364,8 +501,8 @@
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞�
+ command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@@ -390,6 +527,10 @@
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/crn/operator/taskComplete")
public R crnTaskComplete(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -419,6 +560,10 @@
@ManagerAuth(memo = "娓呴櫎鍛戒护")
@PostMapping("/crn/operator/clearCommand")
public R crnClearCommand(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -439,6 +584,10 @@
@ManagerAuth(memo = "鎵嬪姩澶嶄綅")
@PostMapping("/crn/operator/handleReset")
public R handleReset(CrnOperatorParam param) throws Exception {
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -461,7 +610,7 @@
crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand), false)) {
return R.ok();
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
@@ -473,6 +622,148 @@
return R.error();
}
+
+ @ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡")
+ @PostMapping("/crn/operator/auto")
+ public R crnAuto(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�")
+ @PostMapping("/crn/operator/semiAutomatic")
+ public R crnsemiAutomatic(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)2);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡")
+ @PostMapping("/crn/operator/hand")
+ public R onlineWrk1(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)3);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk1")
+ public R onlineWrk2(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk1((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk2")
+ public R onlineWrk3(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk2((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk3")
+ public R onlineWrk4(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk3((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk4")
+ public R crnHand(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk4((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+
+
+
+ private boolean crnControl2(CrnCommand command){
+ if (command.getCrnNo() == null) {
+ throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
+ }
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ if (command.getCrnNo().equals(crn.getId())) {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ // 绌洪棽鍒ゆ柇
+// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(4, command), false)) {
+ return true;
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
+ }
+// } else {
+// throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�");
+// }
+ }
+ }
+ return false;
+ }
+
+
+
+
private boolean crnControl(CrnCommand command){
if (command.getCrnNo() == null) {
@@ -491,11 +782,11 @@
}
// 绌洪棽鍒ゆ柇
// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
- return true;
- } else {
- throw new CoolException("鍛戒护涓嬪彂澶辫触");
- }
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, command), false)) {
+ return true;
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
+ }
// } else {
// throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�");
// }
--
Gitblit v1.9.1