From d89cee787818cab42e768a027c6115a01c7c2e8b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 23 一月 2026 13:46:33 +0800
Subject: [PATCH] #api请求修复批次字段，wms3.0批次使用splr_batch字段
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 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 3511d61..06bceca 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
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
+import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,17 @@
getAGVStaBind(waitPakinPda);
//鐢熸垚浠诲姟
AGVInTaskStart(waitPakinPda, loginUserId);
+ return R.ok();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R AGVBindAndInTaskStart(String barcode) {
+ //楠岃瘉鏉＄爜
+ boolean b = checkStaStatus(barcode);
+ if (!b) {
+ return R.error("鏉＄爜鏈壘鍒板搴旇鍒�");
+ }
return R.ok();
}
@@ -305,6 +317,9 @@
if (!basStation.getUseStatus().equals("O")) {
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
+ if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
+ throw new CoolException("绔欑偣涓哄厜鐢电珯鐐癸紝绂佹鍛煎彨AGV");
+ }
List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class);
if (!areaList.contains(area)) {
@@ -321,8 +336,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;
}
@@ -337,7 +352,7 @@
throw new CoolException("鏌ヨ鍒扮殑瀹瑰櫒涓嶆敮鎸佺洰鏍囧簱鍖�");
}
if (!matches) {
- throw new CoolException("鏉＄爜涓庣珯鐐逛笉鍖归厤");
+ throw new CoolException("瀹瑰櫒涓庣珯鐐逛笉鍖归厤");
}
} else {
throw new CoolException("鏁版嵁寮傚父锛氶獙璇佸熀纭�淇℃伅");
@@ -345,4 +360,42 @@
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