From 45430b88dab1451ecff39236dab01d5668b5b9c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:22 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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..b697fc6 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,14 +1,14 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+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.PakinIOStatus;
import com.vincent.rsf.server.manager.enums.StaUseStatusType;
import com.vincent.rsf.server.manager.service.*;
@@ -18,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -34,6 +35,8 @@
private WarehouseAreasService warehouseAreasService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BasContainerService basContainerService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -82,6 +85,7 @@
@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();
@@ -111,6 +115,13 @@
String targetLoc = LocManageUtil.getTargetLoc(Long.parseLong(area));
taskService.generateAGVTasks(waitPakin,targetLoc,sta,loginUserId);
+
+ basStation.setUseStatus(StaUseStatusType.TYPE_R.type);
+ if (!basStationService.updateById(basStation)){
+ throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�");
+ }
+
+
return R.ok();
}
@@ -248,6 +259,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