From 66e2b81704718350c0a3fcf0dfbd2f9d614b044c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 一月 2026 08:30:38 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
index 901ad04..5672c78 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.service.AgvService;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
@@ -37,11 +38,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R AGVBindAndInTaskStart(Map<String, Object> params, Long loginUserId) {
+ public R AGVBindAndInTaskStart(WaitPakinParam waitPakinPda, Long loginUserId) {
//鍏堢粦瀹�
- getAGVStaBind(params);
+ getAGVStaBind(waitPakinPda);
//鐢熸垚浠诲姟
- AGVInTaskStart(params, loginUserId);
+ AGVInTaskStart(waitPakinPda, loginUserId);
return R.ok();
}
@@ -81,9 +82,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R AGVInTaskStart(Map<String, Object> params, Long loginUserId) {
- String sta = params.get("sta").toString();
- String area = params.get("area").toString();
+ public R AGVInTaskStart(WaitPakinParam waitPakinPda, Long loginUserId) {
+ String sta = waitPakinPda.getStaNo();
+ String area = waitPakinPda.getArea();
if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
@@ -203,9 +204,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R getAGVStaBind(Map<String, Object> params) {
- String barcode = params.get("barcode").toString();
- String sta = params.get("sta").toString();
+ public R getAGVStaBind(WaitPakinParam waitPakinPda) {
+ String barcode = waitPakinPda.getBarcode();
+ String sta = waitPakinPda.getStaNo();
//楠岃瘉鍩虹淇℃伅
BasStation basStation = checkStaStatus(barcode, sta);
//鏇存柊绔欑偣鐘舵��
@@ -254,9 +255,17 @@
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
);
- boolean matches = containers.stream()
- .map(BasContainer::getCodeType)
- .anyMatch(codeType -> barcode.matches(codeType));
+ boolean matches = false;
+ for (BasContainer container : containers) {
+ String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
+ if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
+ matches = true;
+ break; // 鎵惧埌鍖归厤鐨勫氨閫�鍑哄惊鐜�
+ }
+ }
+// boolean matches = containers.stream()
+// .map(BasContainer::getCodeType)
+// .anyMatch(codeType -> barcode.matches(codeType));
if (!matches) {
throw new CoolException("鏉＄爜涓庣珯鐐逛笉鍖归厤");
}
--
Gitblit v1.9.1