From 5d1df2b22fd4e0b31f80385664393cd3d73a21ed Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 19 八月 2025 09:58:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5249ea2..075ff8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.entity.BasDevpPosition;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.WcsDataSynchronizationParam;
@@ -14,7 +13,6 @@
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.SortTheExecutionOfTheCarUtil;
-import com.zy.asrs.utils.Utils;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
@@ -77,7 +75,7 @@
List<WcsTaskListParam> wcsTaskListParamList = new ArrayList<>();
List<WcsRgvListParam> wcsRgvListParamList = new ArrayList<>();
List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<>());
- List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",false));
+ List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",true));
for (WrkMast wrkMast : wrkMastList){
WcsTaskListParam wcsTaskListParam = new WcsTaskListParam(wrkMast);
@@ -96,7 +94,8 @@
WcsRgvListParam wcsRgvListParam = new WcsRgvListParam();
wcsRgvListParam.setRgvNo(rgv.getId().toString());
wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
- wcsRgvListParam.setStatus(rgvProtocol.statusType.desc);
+ wcsRgvListParam.setStatus(rgvProtocol.statusType.id);
+ wcsRgvListParam.setCurrPos(rgvProtocol.RgvPos);
wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString());
List<String> arrayList = new ArrayList<>();
if (rgvProtocol.getAlarm()!=0){
--
Gitblit v1.9.1