From 7bd1e8326844525956f13ebaf4e5549943be484f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 08:12:47 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/controller/OutController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index cd5a48c..ec8168e 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.api.enums.LocAreaType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
@@ -84,8 +85,6 @@
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
-
-
// 鑾峰彇璁㈠崟涓昏〃
OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());
@@ -331,7 +330,7 @@
return R.error("搴撳瓨涓嶈冻");
}
- Thread.sleep(1000L);
+ Thread.sleep(300L);
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
@@ -349,7 +348,10 @@
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", taskDto.getAgvStaNo()));
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
+ .eq("dev_no", taskDto.getAgvStaNo()));
+ if (Objects.isNull(station)) { throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪鎴栧凡浣跨敤锛侊紒"); }
workService.agvStockOut(station, taskDto, getUserId());
}
return R.ok();
--
Gitblit v1.9.1