From 786fccc26cb790d75be1d95077675163699abcf3 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 13:47:58 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 107 +++++++++++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 57 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 117d58e..b3edd3f 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,30 +38,30 @@
@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();
}
@Override
public R getStaMsgSelect(Map<String, Object> params) {
String sta = params.get("sta").toString();
- if (Cools.isEmpty(sta)){
+ if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
.eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
);
- if (Cools.isEmpty(basStation)){
+ if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
}
- List<Long> ids = new ArrayList<>();
+ List<Long> ids = new ArrayList<>();
ids.add(basStation.getArea());
- if (basStation.getIsCrossZone() == 1){
+ 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++) {
@@ -79,115 +80,109 @@
}
-
-
@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();
- if (Cools.isEmpty(sta)){
+ public R AGVInTaskStart(WaitPakinParam waitPakinPda, Long loginUserId) {
+ String sta = waitPakinPda.getStaNo();
+ String area = waitPakinPda.getArea();
+ if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
- if (Cools.isEmpty(area)){
+ if (Cools.isEmpty(area)) {
throw new CoolException("鐩爣搴撳尯涓嶈兘涓虹┖");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
- .eq(BasStation::getUseStatus,LocStsType.LOC_STS_TYPE_F.type)
+ .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
);
- if (Cools.isEmpty(basStation)){
+ if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
}
- if (Cools.isEmpty(basStation.getBarcode())){
+ if (Cools.isEmpty(basStation.getBarcode())) {
throw new CoolException("鏁版嵁閿欒锛屾帴椹崇珯鏃犳潯鐮佷俊鎭�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, basStation.getBarcode())
- .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
);
- if (Cools.isEmpty(waitPakin)){
+ if (Cools.isEmpty(waitPakin)) {
throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
}
String targetLoc = LocManageUtil.getTargetLoc(Long.parseLong(area));
- taskService.generateAGVTasks(waitPakin,targetLoc,sta,loginUserId);
+ taskService.generateAGVTasks(waitPakin, targetLoc, sta, loginUserId);
basStation.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
- if (!basStationService.updateById(basStation)){
+ if (!basStationService.updateById(basStation)) {
throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�");
}
-
-
return R.ok();
}
-
@Override
public R AGVStaUnBind(Map<String, Object> params) {
String sta = params.get("sta").toString();
- if (Cools.isEmpty(sta)){
+ if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
- .eq(BasStation::getUseStatus,LocStsType.LOC_STS_TYPE_F.type)
+ .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
);
- if (Cools.isEmpty(basStation)){
+ if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
}
- if (Cools.isEmpty(basStation.getBarcode())){
+ if (Cools.isEmpty(basStation.getBarcode())) {
throw new CoolException("鏁版嵁閿欒锛屾帴椹崇珯鏃犳潯鐮佷俊鎭�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, basStation.getBarcode())
- .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
);
- if (Cools.isEmpty(waitPakin)){
+ if (Cools.isEmpty(waitPakin)) {
throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
}
basStation.setBarcode(null);
basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
- if (!basStationService.updateById(basStation)){
+ if (!basStationService.updateById(basStation)) {
throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�");
}
return R.ok("瑙ｇ粦鎴愬姛");
}
-
@Override
public R getStaBindList(Map<String, Object> params) {
String sta = params.get("sta").toString();
- if (Cools.isEmpty(sta)){
+ if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
- .eq(BasStation::getUseStatus,LocStsType.LOC_STS_TYPE_F.type)
+ .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
);
- if (Cools.isEmpty(basStation)){
+ if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
}
- if (Cools.isEmpty(basStation.getBarcode())){
+ if (Cools.isEmpty(basStation.getBarcode())) {
throw new CoolException("鏁版嵁閿欒锛屾帴椹崇珯鏃犳潯鐮佷俊鎭�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, basStation.getBarcode())
- .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
);
- if (Cools.isEmpty(waitPakin)){
+ if (Cools.isEmpty(waitPakin)) {
throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
}
List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
- if (Cools.isEmpty(waitPakinItems)){
+ if (Cools.isEmpty(waitPakinItems)) {
throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏");
}
- List<Long> ids = new ArrayList<>();
+ List<Long> ids = new ArrayList<>();
ids.add(basStation.getArea());
- if (basStation.getIsCrossZone() == 1){
+ 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++) {
@@ -207,56 +202,54 @@
}
-
@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);
//鏇存柊绔欑偣鐘舵��
basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
basStation.setBarcode(barcode);
- if (!basStationService.updateById(basStation)){
+ if (!basStationService.updateById(basStation)) {
throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�");
}
return R.ok("缁戝畾鎴愬姛");
}
-
- private BasStation checkStaStatus(String barcode, String sta){
- if (Cools.isEmpty(barcode)){
+ private BasStation checkStaStatus(String barcode, String sta) {
+ if (Cools.isEmpty(barcode)) {
throw new CoolException("瀹瑰櫒鐮佷笉鑳戒负绌�");
}
- if (Cools.isEmpty(sta)){
+ if (Cools.isEmpty(sta)) {
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)){
+ if (Cools.isEmpty(waitPakin)) {
throw new CoolException("瀹瑰櫒鐮佹湭鎵惧埌缁勬墭淇℃伅,璇锋鏌ョ粍鎵樼姸鎬�");
}
BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getBarcode, barcode)
- ,false
+ , false
);
- if (!Cools.isEmpty(isBarcodeSta)){
- throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
+ if (!Cools.isEmpty(isBarcodeSta)) {
+ throw new CoolException("璇ユ潯鐮佸凡琚�" + isBarcodeSta.getStationName() + "绔欑粦瀹�");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
);
- if (Cools.isEmpty(basStation)){
+ if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
}
- if (!basStation.getUseStatus().equals("O")){
+ if (!basStation.getUseStatus().equals("O")) {
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- if (!Cools.isEmpty(basStation.getContainerType())){
+ if (!Cools.isEmpty(basStation.getContainerType())) {
List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class);
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
--
Gitblit v1.9.1