From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 44abf25..eaada3a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -14,7 +14,6 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
@@ -254,23 +253,29 @@
List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
- if (config != null) {
- if (config.getStatus().intValue() == 1) {
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locDto.getAgvStaNo()));
- if (agvWrkMasts != null && !agvWrkMasts.isEmpty()) {
- for (AgvWrkMast agvWrkMast : agvWrkMasts) {
- if (agvWrkMast.getWrkSts() < 204) {
- return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈変换鍔★紝绛変换鍔″畬鎴愭垨鑰呰揣鏋舵惉璧板啀鍙枡");
- }
- }
- }
- }
- }
+// Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
+// if (config != null) {
+// if (config.getStatus().intValue() == 1) {
+// List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locDto.getAgvStaNo()));
+// if (agvWrkMasts != null && !agvWrkMasts.isEmpty()) {
+// for (AgvWrkMast agvWrkMast : agvWrkMasts) {
+// if (agvWrkMast.getWrkSts() < 204) {
+// return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈変换鍔★紝绛変换鍔″畬鎴愭垨鑰呰揣鏋舵惉璧板啀鍙枡");
+// }
+// }
+// }
+// }
+// }
if (!staNoList.contains(locDto.getAgvStaNo())) {
- return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locDto.getAgvStaNo()));
+ if (Cools.isEmpty(agvWrkMast.getPdcType())) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔�,宸ヤ綔鍙凤細" + agvWrkMast.getWrkNo() + ",鐗╂枡搴撲綅鍙凤細" + agvWrkMast.getSourceLocNo() + ",浠诲姟鐘舵�侊細" + agvWrkMast.getWrkSts$());
+ } else {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔�,宸ヤ綔鍙凤細" + agvWrkMast.getWrkNo() + ",鐗╂枡搴撲綅鍙凤細" + agvWrkMast.getSourceLocNo() + ",浠诲姟鐘舵�侊細" + agvWrkMast.getWrkSts$() + ",灏忚溅缂栧彿锛�" + agvWrkMast.getPdcType());
+
+ }
}
}
//濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥�
--
Gitblit v1.9.1