From 7993b50ce6d99ba6abc6f979b3fece2490795fde Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期日, 11 五月 2025 15:16:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 34 ++++++++++++++++
src/main/java/com/zy/asrs/entity/param/WcsStatusResponseModel.java | 12 ++++++
src/main/java/com/zy/asrs/controller/CrnController.java | 8 ++--
src/main/resources/application.yml | 8 ++-
5 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e045613..cd1ae7f 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -54,10 +54,10 @@
@RestController
public class CrnController {
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
+// @Value("${wms.url}")
+// private String wmsUrl;
+// @Value("${wms.movePath}")
+// private String movePath;
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 55a8a63..5a20234 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -491,6 +491,7 @@
auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
List<Object> list = new ArrayList<>();
+ WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel();
for (BasDevp basDevp:basDevps){
BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
basDevpWmsParam.setDevNo(basDevp.getDevNo());
@@ -501,7 +502,8 @@
basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
- list.add(basDevpWmsParam);
+// list.add(basDevpWmsParam);
+ wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
}
List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -518,7 +520,6 @@
basCrnpWmsParam.sync(basCrnp);
basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
- basCrnpWmsParamList.add(basCrnpWmsParam);
try{
BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
@@ -526,9 +527,11 @@
} catch (Exception e){
basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
}
+ basCrnpWmsParamList.add(basCrnpWmsParam);
- list.add(basCrnpWmsParam);
+// list.add(basCrnpWmsParam);
}
+ wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
if (Cools.isEmpty(rgvStatus)){
@@ -547,13 +550,15 @@
} catch (Exception e){
basRgvWmsParam.setSteErrM("鏈煡寮傚父");
}
- list.add(basRgvWmsParam);
+// list.add(basRgvWmsParam);
+ wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
+
}
// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
// for (BasCrnp basCrnp:basCrnps){
// list.add(basCrnp);
// }
- return R.ok(list);
+ return R.ok(wcsStatusResponseModel);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/WcsStatusResponseModel.java b/src/main/java/com/zy/asrs/entity/param/WcsStatusResponseModel.java
new file mode 100644
index 0000000..75c3105
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/WcsStatusResponseModel.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class WcsStatusResponseModel {
+ private List<BasDevpWmsParam> chainList = new ArrayList<>();
+ private List<BasCrnpWmsParam> pilingCarList = new ArrayList<>();
+ private List<BasRgvWmsParam> rgvList = new ArrayList<>();
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ed4d6fb..3559858 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -463,7 +463,7 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
// && staProtocol.isInEnable()
- && (workNo == 0 || (workNo>9000 && workNo<10000))
+// && (workNo == 0 || (workNo>9000 && workNo<10000))
&& staProtocol.isPakMkWalk()
) {
if (inSta.isBarcodeSign()){
@@ -1372,6 +1372,32 @@
}
return true;
}
+ public boolean rgvOtherIDLE(RgvSlave slave) {
+ RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+ RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+
+ if (rgvProtocol == null || rgvTaskProtocol == null) {
+ return false;
+ }
+ if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1
+ || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
+ return false;
+ }
+ RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+ RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
+
+ if (rgvProtocolOther == null) {
+ return true;
+ }
+ if (rgvProtocolOther.statusEnable) {
+ if (rgvProtocolOther.getModeType().equals(RgvModeType.AUTO)
+ && rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)
+ && rgvProtocolOther.getLoaded()==0) {
+ return false;
+ }
+ }
+ return true;
+ }
public TaskWrk deviceDetection(RgvSlave.RgvStn inSta) {
@@ -1482,6 +1508,12 @@
}
}
+ if (!sign){
+ if (!rgvOtherIDLE(rgvSlave)){
+ sign=true;
+ }
+ }
+
if (!sign) {
for (Integer staNoNow : rangeList) {
for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 546cab4..fc943e3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,8 @@
# username: sa
# password: sa@123
driver-class-name: dm.jdbc.driver.DmDriver
- url: jdbc:dm://10.10.10.201:5236/SOURCE
+# url: jdbc:dm://10.10.10.201:5236/SOURCE
+ url: jdbc:dm://127.0.0.1:5236/SOURCE
username: SYSDBA
password: Zy@12345
mvc:
@@ -73,6 +74,7 @@
# 浠诲姟鐘舵�佸弽棣堟帴鍙�
taskStatusFeedbackPath: external/wcs/taskStatusFeedback
# 璐т綅鐘舵�佹洿鏂版帴鍙�
- locationUpdatePath: api/InterFace/get_InterFace_TestStorage
+# locationUpdatePath: api/InterFace/get_InterFace_TestStorage
# 绉诲簱鐢宠鎺ュ彛
- movePath: api/InterFace/get_InterFace_TestStorage
+# movePath: api/InterFace/get_InterFace_TestStorage
+ wmsHeartBeat: external/wcs/wmsHeartBeat
--
Gitblit v1.9.1