From f2b48ce0cfdf9b68ecc7c9d84937d69500590f81 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:28 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 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 f1524b2..dc2d1f8 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
@@ -35,6 +35,51 @@
@Autowired
private TaskService taskService;
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R AGVBindAndInTaskStart(Map<String, Object> params, Long loginUserId) {
+ //鍏堢粦瀹�
+ getAGVStaBind(params);
+ //鐢熸垚浠诲姟
+ AGVInTaskStart(params, loginUserId);
+ return R.ok();
+ }
+
+ @Override
+ public R getStaMsgSelect(Map<String, Object> params) {
+ String sta = params.get("sta").toString();
+ if (Cools.isEmpty(sta)){
+ throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
+ }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, sta)
+ .eq(BasStation::getUseStatus,StaUseStatusType.TYPE_O.type)
+ );
+ if (Cools.isEmpty(basStation)){
+ throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
+ }
+ List<Long> ids = new ArrayList<>();
+ ids.add(basStation.getArea());
+ if (basStation.getIsCrossZone() == 1){
+ String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1);
+ String[] parts = content.split(",");
+ for (int i = 0; i < parts.length; i++) {
+ ids.add(Long.parseLong(parts[i].trim()));
+ }
+ }
+ List<WarehouseAreas> warehouseAreasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .in(WarehouseAreas::getId, ids)
+ );
+
+ return R.ok(Cools
+ .add("barcode", basStation.getBarcode())
+ .add("warehouseAreasList", warehouseAreasList)
+ .add("area", basStation.getArea())
+ );
+ }
+
+
+
@Override
public R AGVInTaskStart(Map<String, Object> params,Long loginUserId ) {
@@ -70,6 +115,8 @@
return R.ok();
}
+
+
@Override
public R AGVStaUnBind(Map<String, Object> params) {
String sta = params.get("sta").toString();
--
Gitblit v1.9.1