From bedcf032da67df5e9b7c6a7d24a4f23114409f8f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 12:46:00 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 8185b8a..141a91f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -4,13 +4,16 @@
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;
import com.zy.asrs.entity.param.WcsRgvListParam;
import com.zy.asrs.entity.param.WcsTaskDistributionParam;
import com.zy.asrs.entity.param.WcsTaskListParam;
+import com.zy.asrs.service.BasDevpPositionService;
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;
@@ -39,6 +42,8 @@
private SlaveProperties slaveProperties;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpPositionService basDevpPositionService;
@Override
@Transactional
@@ -68,6 +73,8 @@
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));
+
for (WrkMast wrkMast : wrkMastList){
WcsTaskListParam wcsTaskListParam = new WcsTaskListParam(wrkMast);
wcsTaskListParamList.add(wcsTaskListParam);
@@ -86,6 +93,7 @@
wcsRgvListParam.setRgvNo(rgv.getId().toString());
wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
wcsRgvListParam.setStatus(rgvProtocol.statusType.desc);
+ wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos()).toString());
List<String> arrayList = new ArrayList<>();
if (rgvProtocol.getAlarm()!=0){
arrayList.add(rgvProtocol.getAlarm$());
--
Gitblit v1.9.1