From 076cd7a73eb60c86d43eda67c5625704576d44cc Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:03 +0800
Subject: [PATCH] 实现mes空托和agv任务接口
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index c3eb5b8..a82c6c0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -141,7 +141,7 @@
for (BasContainer container : containers) {
String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
- List<Integer> areaList2 = container.getAreas();
+ List<Integer> areaList2 = container.getAreasIds();
if (!areaList2.contains(Integer.parseInt(area))) {
matches2 = false;
continue;
@@ -170,7 +170,8 @@
@Transactional(rollbackFor = Exception.class)
public synchronized R generateTasks(PdaGeneralParam param, Long loginUserId) {
-// DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId),false);
+// DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId)
+// .last("LIMIT 1"));
// if (Objects.isNull(deviceSite)) {
// throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
// }
@@ -181,6 +182,9 @@
}
StringBuilder errorBuilder = new StringBuilder();
List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
+ if (areaTypeList.isEmpty()) {
+ throw new CoolException("鏈煡璇㈠埌璧风偣鍙叆搴撳尯锛堝簱浣嶈鍒欐湭閰嶇疆锛夛紒锛侊紒");
+ }
for (Long areaType : areaTypeList) {
if (errorBuilder.length() > 0) {
errorBuilder.append(",");
@@ -203,7 +207,7 @@
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, station.getStationName())
.eq(DeviceSite::getAreaIdEnd, warehouseArea.getId())
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPITY_IN.type).last("limit 1"));
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_IN.type).last("limit 1"));
if (Cools.isEmpty(deviceSite)) {
errorBuilder.append("鏃犲彲鐢ㄨ矾寰�");
continue;
@@ -225,24 +229,31 @@
// throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
}
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ String ruleCode = StringUtils.isBlank(param.getTaskNo()) ?
+ SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null) : param.getTaskNo();
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
}
- BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
- String stationName = stationCode.getStationName();
- if (Cools.isEmpty(stationCode)) {
+ String stationName = null;
+ if (Cools.isEmpty(deviceSite.getDeviceCode())) {
stationName = station.getStationName();
+ } else {
+ BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
+ stationName = stationCode.getStationName();
+ if (Cools.isEmpty(stationCode)) {
+ stationName = station.getStationName();
+ }
}
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
- .setTaskType(TaskType.TASK_TYPE_EMPITY_IN.type)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
+ .setTaskType(TaskType.TASK_TYPE_EMPTY_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh寰呬慨鏀�
.setTargLoc(targetLoc)
.setOrgSite(station.getStationName())
.setBarcode(param.getContainerNo())
.setTargSite(stationName)
+ .setTaskOrigin(StringUtils.isBlank(param.getTaskOrigin()) ? null : param.getTaskOrigin())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
if (!taskService.save(task)) {
--
Gitblit v1.9.1