From 239ab7dd1df24ec6a45e6bb2322fb8186ce8ac8f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 19:34:53 +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/manager/controller/WaitPakinController.java | 20 ++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 17 +++++++-
4 files changed, 109 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
index f436604..1d6c105 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.controller.params.OpStockParams;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -23,8 +24,18 @@
@Autowired
private AgvService agvService;
+ @ApiOperation("绔欑偣缁戝畾鏌ヨ")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ @PostMapping("/staBind/list")
+ public R getStaBindList(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return agvService.getStaBindList(params);
+ }
+
@PreAuthorize("hasAuthority('manager:basStation:list')")
- @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+ @ApiOperation("绔欑偣缁戝畾")
@PostMapping("/AGV/staBind")
public R getAGVStaBind(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -34,12 +45,12 @@
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
- @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+ @ApiOperation("绔欑偣瑙ｇ粦")
@PostMapping("/AGV/staUnBind")
public R getAGVStaUnBind(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return agvService.getAGVStaBind(params);
+ return agvService.AGVStaUnBind(params);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java
index 5f12328..d981b1a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java
@@ -6,4 +6,8 @@
public interface AgvService {
R getAGVStaBind(Map<String, Object> params);
+
+ R getStaBindList(Map<String, Object> params);
+
+ R AGVStaUnBind(Map<String, Object> params);
}
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..11eba46 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
@@ -7,9 +7,11 @@
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.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.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,6 +27,77 @@
private WaitPakinService waitPakinService;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+
+ @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,StaUseStatusType.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(StaUseStatusType.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,StaUseStatusType.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("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏");
+ }
+
+
+
+ return R.ok(Cools
+ .add("barcode", basStation.getBarcode())
+ .add("list", waitPakinItems)
+ );
+ }
+
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -42,6 +115,8 @@
return R.ok("缁戝畾鎴愬姛");
}
+
+
private BasStation checkStaStatus(String barcode, String sta){
if (Cools.isEmpty(barcode)){
throw new CoolException("瀹瑰櫒鐮佷笉鑳戒负绌�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 8e088f9..7f14c47 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -12,13 +12,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
-import com.vincent.rsf.server.manager.service.TaskItemService;
-import com.vincent.rsf.server.manager.service.TaskService;
-import com.vincent.rsf.server.manager.service.WaitPakinItemService;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,6 +39,9 @@
@Autowired
private WaitPakinItemService waitPakinItemService;
+
+ @Autowired
+ private BasStationService basStationService;
@Autowired
private TaskService taskService;
@@ -112,6 +113,17 @@
if (Arrays.asList(ids).isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ for (Long id : ids) {
+ WaitPakin waitPakin = waitPakinService.getById(id);
+ BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getBarcode, waitPakin.getBarcode())
+ ,false
+ );
+ if (!Cools.isEmpty(isBarcodeSta)){
+ throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
+ }
+ }
+
return waitPakinService.removePakin(Arrays.asList(ids));
}
--
Gitblit v1.9.1