From 5d2de26fe8fec9900bae351666e0afb442bb0f79 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 13:42:13 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 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 d0ad1cb..f6ee6f4 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
@@ -47,6 +47,17 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public R AGVBindAndInTaskStart(String barcode) {
+ //楠岃瘉鏉＄爜
+ boolean b = checkStaStatus(barcode);
+ if (!b) {
+ return R.error("鏉＄爜鏈壘鍒板搴旇鍒�");
+ }
+ return R.ok();
+ }
+
+ @Override
public R getStaMsgSelect(Map<String, Object> params) {
String sta = params.get("sta").toString();
if (Cools.isEmpty(sta)) {
@@ -269,6 +280,8 @@
if (!matches) {
throw new CoolException("鏉＄爜涓庣珯鐐逛笉鍖归厤");
}
+ } else {
+ throw new CoolException("鏁版嵁寮傚父锛氶獙璇佸熀纭�淇℃伅");
}
return basStation;
@@ -319,8 +332,8 @@
for (BasContainer container : containers) {
String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
- List<String> areaList2 = JSONObject.parseArray(container.getAreas(), String.class);
- if (!areaList2.contains(area)) {
+ List<Integer> areaList2 = container.getAreas();
+ if (!areaList2.contains(Integer.valueOf(area))) {
matches2 = false;
continue;
}
@@ -331,14 +344,54 @@
// boolean matches = containers.stream()
// .map(BasContainer::getCodeType)
// .anyMatch(codeType -> barcode.matches(codeType));
- if (!matches) {
- throw new CoolException("鏉＄爜涓庣珯鐐逛笉鍖归厤");
- }
if (!matches2) {
throw new CoolException("鏌ヨ鍒扮殑瀹瑰櫒涓嶆敮鎸佺洰鏍囧簱鍖�");
}
+ if (!matches) {
+ throw new CoolException("瀹瑰櫒涓庣珯鐐逛笉鍖归厤");
+ }
+ } else {
+ throw new CoolException("鏁版嵁寮傚父锛氶獙璇佸熀纭�淇℃伅");
}
return basStation;
}
+ private boolean checkStaStatus(String barcode) {
+ if (Cools.isEmpty(barcode)) {
+ throw new CoolException("瀹瑰櫒鐮佷笉鑳戒负绌�");
+ }
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, barcode)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ );
+ if (Cools.isEmpty(waitPakin)) {
+ throw new CoolException("瀹瑰櫒鐮佹湭鎵惧埌缁勬墭淇℃伅,璇锋鏌ョ粍鎵樼姸鎬�");
+ }
+ BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getBarcode, barcode)
+ , false
+ );
+ if (!Cools.isEmpty(isBarcodeSta)) {
+ throw new CoolException("璇ユ潯鐮佸凡琚�" + isBarcodeSta.getStationName() + "绔欑粦瀹�");
+ }
+
+ List<BasContainer> containers = basContainerService.list(
+ new LambdaQueryWrapper<BasContainer>());
+ boolean matches = false;
+ for (BasContainer container : containers) {
+ String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
+ if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
+ matches = true;
+ return true;
+ }
+ }
+// boolean matches = containers.stream()
+// .map(BasContainer::getCodeType)
+// .anyMatch(codeType -> barcode.matches(codeType));
+ if (!matches) {
+ return false;
+ }
+
+ return true;
+ }
}
--
Gitblit v1.9.1