From 18b35f1400df83e20a870dbfd7e97ae9ca277cbd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:38 +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 | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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 11eba46..f1524b2 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
@@ -8,15 +8,16 @@
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.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 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;
@@ -29,6 +30,45 @@
private BasStationService basStationService;
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private TaskService taskService;
+
+
+ @Override
+ 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,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("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
+ }
+ String targetLoc = LocManageUtil.getTargetLoc(Long.parseLong(area));
+
+ taskService.generateAGVTasks(waitPakin,targetLoc,sta,loginUserId);
+
+ return R.ok();
+ }
@Override
public R AGVStaUnBind(Map<String, Object> params) {
@@ -61,6 +101,8 @@
return R.ok("瑙ｇ粦鎴愬姛");
}
+
+
@Override
public R getStaBindList(Map<String, Object> params) {
String sta = params.get("sta").toString();
@@ -88,12 +130,24 @@
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())
);
}
--
Gitblit v1.9.1