From f1148a16d18e7d0f095fbd2341410104de665fc1 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 14:39:54 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 120 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 53 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 dc2d1f8..901ad04 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,16 +1,14 @@
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.WaitPakinItem;
-import com.vincent.rsf.server.manager.entity.WarehouseAreas;
+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.*;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +32,8 @@
private WarehouseAreasService warehouseAreasService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BasContainerService basContainerService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -48,19 +48,19 @@
@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,StaUseStatusType.TYPE_O.type)
+ .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,107 +79,109 @@
}
-
-
@Override
- public R AGVInTaskStart(Map<String, Object> params,Long loginUserId ) {
+ @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)){
+ 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,StaUseStatusType.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)) {
+ 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,StaUseStatusType.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(StaUseStatusType.TYPE_O.type);
- if (!basStationService.updateById(basStation)){
+ 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)){
+ if (Cools.isEmpty(sta)) {
throw new CoolException("鎺ラ┏浣嶆潯鐮佷笉鑳戒负绌�");
}
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, sta)
- .eq(BasStation::getUseStatus,StaUseStatusType.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++) {
@@ -199,7 +201,6 @@
}
-
@Override
@Transactional(rollbackFor = Exception.class)
public R getAGVStaBind(Map<String, Object> params) {
@@ -208,46 +209,59 @@
//楠岃瘉鍩虹淇℃伅
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)){
+ 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())) {
+ 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