From dc23ab59268e6dccd7d50d10cf8cffe1bf67d551 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 五月 2025 18:55:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 16769ba..5a20234 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -343,7 +343,7 @@
// List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (CarryParam param:params){
param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
-
+ param.updateLocNo();
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -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);
}
--
Gitblit v1.9.1