From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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 | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 204 insertions(+), 6 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 3e87aed..117d58e 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
@@ -1,20 +1,21 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.Cools;
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.entity.BasStation;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
+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.StaUseStatusType;
-import com.vincent.rsf.server.manager.service.BasStationService;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.utils.LocManageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -25,6 +26,187 @@
private WaitPakinService waitPakinService;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private BasContainerService basContainerService;
+
+ @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, LocStsType.LOC_STS_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
+ @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)){
+ throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
+ }
+ 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)
+ );
+ if (Cools.isEmpty(basStation)){
+ throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
+ }
+ 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)
+ );
+ if (Cools.isEmpty(waitPakin)){
+ throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
+ }
+ String targetLoc = LocManageUtil.getTargetLoc(Long.parseLong(area));
+
+ taskService.generateAGVTasks(waitPakin,targetLoc,sta,loginUserId);
+
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ 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)){
+ throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
+ }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, sta)
+ .eq(BasStation::getUseStatus,LocStsType.LOC_STS_TYPE_F.type)
+ );
+ if (Cools.isEmpty(basStation)){
+ throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
+ }
+ 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)
+ );
+ if (Cools.isEmpty(waitPakin)){
+ throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
+ }
+ basStation.setBarcode(null);
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+ 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)){
+ throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
+ }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, sta)
+ .eq(BasStation::getUseStatus,LocStsType.LOC_STS_TYPE_F.type)
+ );
+ if (Cools.isEmpty(basStation)){
+ throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
+ }
+ 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)
+ );
+ if (Cools.isEmpty(waitPakin)){
+ throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
+ }
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+ if (Cools.isEmpty(waitPakinItems)){
+ 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("list", waitPakinItems)
+ .add("warehouseAreasList", warehouseAreasList)
+ .add("area", basStation.getArea())
+ );
+ }
+
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -34,13 +216,15 @@
//楠岃瘉鍩虹淇℃伅
BasStation basStation = checkStaStatus(barcode, sta);
//鏇存柊绔欑偣鐘舵��
- basStation.setUseStatus(StaUseStatusType.TYPE_F.type);
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
basStation.setBarcode(barcode);
if (!basStationService.updateById(basStation)){
throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�");
}
return R.ok("缁戝畾鎴愬姛");
}
+
+
private BasStation checkStaStatus(String barcode, String sta){
if (Cools.isEmpty(barcode)){
@@ -72,6 +256,20 @@
if (!basStation.getUseStatus().equals("O")){
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
+ if (!Cools.isEmpty(basStation.getContainerType())){
+ List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class);
+ List<BasContainer> containers = basContainerService.list(
+ new LambdaQueryWrapper<BasContainer>()
+ .in(BasContainer::getContainerType, longs1)
+ );
+ boolean matches = containers.stream()
+ .map(BasContainer::getCodeType)
+ .anyMatch(codeType -> barcode.matches(codeType));
+ if (!matches) {
+ throw new CoolException("鏉＄爜涓庣珯鐐逛笉鍖归厤");
+ }
+ }
+
return basStation;
}
}
--
Gitblit v1.9.1