From c289447144f4599fe2e13d342c28a3c4d49f750f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 25 十一月 2025 20:06:54 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/CrnController.java | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 6376556..1f63686 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -10,12 +10,10 @@
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.BasCrnError;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
@@ -35,6 +33,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -248,6 +247,8 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ boolean locSts = isLocSts(param.getRow().toString(), param.getBay().toString(), param.getLev().toString());
+ command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -265,6 +266,8 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ boolean locSts = isLocSts(param.getSourceRow().toString(), param.getSourceBay().toString(), param.getSourceLev().toString());
+ command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -286,7 +289,11 @@
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
.eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
- VersionUtils.locMoveCheckLocType(sourceLoc, loc);
+ if (sourceLoc.getLocType1() != loc.getLocType1()){
+ return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
+ }
+ command.setTraySize(loc.getLocType1() == 2);
+// VersionUtils.locMoveCheckLocType(sourceLoc, loc);
return crnControl(command)?R.ok():R.error();
}
@@ -376,6 +383,8 @@
return crnControl(command)?R.ok():R.error();
}
+
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
@@ -394,8 +403,18 @@
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
- MessageQueue.clear(SlaveType.Crn, param.getCrnNo());
- return R.ok("娓呴櫎鍛戒护鎴愬姛");
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+ command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+ return crnControl(command)?R.ok():R.error();
}
@ManagerAuth(memo = "鎵嬪姩澶嶄綅")
@@ -491,5 +510,97 @@
}
}
+ private boolean isLocSts(String row,String bay,String lev){
+ String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", loc));
+ if (Cools.isEmpty(locMast)){
+ return false;
+ }
+ if (locMast.getLocType1() == 2){
+ return true;
+ }
+ return false;
+ }
+
+ @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.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+ vo.setSourceStaNo(wrkMast.getLocNo()); // 婧愮珯
+ vo.setStaNo(wrkMast.getStaNo().toString()); // 鐩爣绔�
+// vo.setSourceLocNo(taskWrk.getTargetPoint()); // 婧愬簱浣�
+// vo.setLocNo(taskWrk.getLocNo()); // 鐩爣搴撲綅
+ }
+ } else {
+ if (Cools.isEmpty(crnProtocol.modeType)){
+ vo.setDeviceStatus(CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ } else {
+ vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ }
+ }
+ vo.setLaneNo(crnProtocol.getCrnNo()); //
+ vo.setErrorCrn("-"); //
+ 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)
+ if (Cools.isEmpty(crnProtocol.modeType)){
+ vo.setStatusType(CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ } else {
+ 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.getAlarm()));
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+ vo.setInEnable(basCrnp.getInEnable());
+ vo.setOutEnable(basCrnp.getOutEnable());
+ vo.setHpMk(basCrnp.getHpMk());
+// vo.setTaskComplete(crnThread.getResetFlag()? "浠诲姟瀹屾垚涓嬪彂绛夊緟":"-");
+ vo.setTaskComplete("-");
+ vo.setDemo(SystemProperties.WCS_RUNNING_STATUS_DEMO.get()? "寮�鍚�":"鍏抽棴");
+ vo.setDemoValue(SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE);
+ if (vo.getHpMk().equals("N")){
+ vo.setDemo("鏈紑鍚�");
+ vo.setDemoValue(0);
+ }
+ }
+ return R.ok().add(list);
+ }
+
}
--
Gitblit v1.9.1