From aa2c08620a28a862da0353233f7163de08cae060 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 22 十月 2025 08:53:41 +0800
Subject: [PATCH] 希日出库修改确认
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
index b5c2bf0..28e7e2b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -7,10 +7,7 @@
import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.FuncStaType;
-import com.zy.acs.manager.manager.enums.StatusType;
-import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.enums.TaskTypeType;
+import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.FuncStaMapper;
import com.zy.acs.manager.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +53,7 @@
@Override
public List<FuncSta> findInIdleStatus(FuncStaType type, Long agvId) {
LambdaQueryWrapper<FuncSta> wrapper = new LambdaQueryWrapper<FuncSta>()
- .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val);
+ .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val).eq(FuncSta::getState, FuncStaStateType.IDLE.toString());
List<FuncSta> funcStaList = this.list(wrapper);
if (Cools.isEmpty(funcStaList)) {
@@ -64,16 +61,16 @@
}
// area limit
- List<String> areaCodeList = agvAreaDispatcher.getAreaCodeListByAgvNo(agvService.getAgvNo(agvId));
- if (Cools.isEmpty(areaCodeList)) {
- funcStaList.clear();
- } else {
- funcStaList.removeIf(funcSta -> {
- Code code = codeService.getCacheById(funcSta.getCode());
- if (Cools.isEmpty(code, code.getData())) { return true; }
- return !areaCodeList.contains(code.getData());
- });
- }
+// List<String> areaCodeList = agvAreaDispatcher.getAreaCodeListByAgvNo(agvService.getAgvNo(agvId));
+// if (Cools.isEmpty(areaCodeList)) {
+// funcStaList.clear();
+// } else {
+// funcStaList.removeIf(funcSta -> {
+// Code code = codeService.getCacheById(funcSta.getCode());
+// if (Cools.isEmpty(code, code.getData())) { return true; }
+// return !areaCodeList.contains(code.getData());
+// });
+// }
if (!Cools.isEmpty(funcStaList)) {
Collections.shuffle(funcStaList);
--
Gitblit v1.9.1