From 559b2321be06967f32eb40ba434790b735d7fa33 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 16:53:55 +0800
Subject: [PATCH] 出库时，检测到选择的站点没有空的暂存位，则等成等待任务，等待任务的出库站点暂时不分配。 新增定时处理等待任务
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 90e71b5..d1bd0b8 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,12 +1,12 @@
package com.zy.asrs.controller;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvMobileService;
import com.zy.asrs.service.AgvWorkService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +32,8 @@
private AgvBasDevpService agvBasDevpService;
@Autowired
private AgvWorkService workService;
+ @Autowired
+ private OrderDetlService orderDetlService;
/*
@@ -74,14 +76,10 @@
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- if (!"F".equals(agvBasDevp.getLocSts())) {
- throw new CoolException("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱锛岃閲嶆柊閫夋嫨");
- }
- return agvBasDevp;
+ return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
--
Gitblit v1.9.1