From 8b38ec303730ace01805c71f5d11c25a79ab8370 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 25 十一月 2025 15:12:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7e40f99..adeadee 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -68,6 +68,8 @@
private LocOwnerService locOwnerService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
@Override
@Transactional
@@ -790,7 +792,6 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- Integer devpId = 1;
// 鍒涘缓瀵硅薄锛堟瀯閫犲嚱鏁颁腑宸茬敓鎴� timestamp锛�
BasAgvMast basAgvMast = new BasAgvMast();
// 鐢熸垚 WMS 浠诲姟鍙凤紙濡傛棤澶栭儴浼犲叆锛屽彲浠ヤ娇鐢ㄩ洩鑺盜D 鎴栬嚜澧烇級
@@ -806,7 +807,7 @@
basAgvMast.setAppeTime(new Date()); // 娣诲姞鏃堕棿
basAgvMast.setModiTime(new Date()); // 淇敼鏃堕棿
basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
- basAgvMast.setDevpId(devpId);
+ basAgvMast.setFloorNo(param.getFloorNo()); //妤煎眰
// 鎻掑叆鏁版嵁搴�
basAgvMastService.insert(basAgvMast);
@@ -816,32 +817,40 @@
@Override
@Transactional
- public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param){
-
- if (param == null || Cools.isEmpty(param.getLocNoList())) {
- throw new CoolException("搴撲綅鍙蜂笉鑳戒负绌�");
- }
-
- List<String> locNos = param.getLocNoList();
-
+ public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param) {
List<AgvLocListDetlParam> result = new ArrayList<>();
- for (String locNo : locNos) {
+ if (Cools.isEmpty(param.getLocNo())) {
+ EntityWrapper<LocMast> locMastEntityWrapper = new EntityWrapper<>();
+ locMastEntityWrapper.setSqlSelect("TOP 5 loc_no as locNo,loc_sts as locSts")
+ .where("loc_sts in ('F','D','S','R') and whs_type = '5'");
+ List<LocMast> locMasts = locMastService.selectList(locMastEntityWrapper);
- // 鏌ヨ璇ュ簱浣� detail
- List<LocDetl> detlList = locDetlService.selectList(
- new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ for (LocMast locMast : locMasts) {
+ result.add(buildAgvLocListDetlParam(locMast.getLocNo(), locMast.getLocSts$()));
+ }
+ } else {
+ LocMast locMast = locMastService.selectOne(
+ new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo())
);
-
- AgvLocListDetlParam dto = new AgvLocListDetlParam();
- dto.setLocNo(locNo);
- dto.setAgvDetlList(detlList);
- result.add(dto);
+ result.add(buildAgvLocListDetlParam(param.getLocNo(), locMast.getLocSts$()));
}
-
+
return result;
}
+ private AgvLocListDetlParam buildAgvLocListDetlParam(String locNo, String locSts) {
+ List<LocDetl> detlList = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ );
+
+ AgvLocListDetlParam dto = new AgvLocListDetlParam();
+ dto.setLocNo(locNo);
+ dto.setLocSys(locSts);
+ dto.setAgvDetlList(detlList);
+ return dto;
+ }
+
@Override
@Transactional
--
Gitblit v1.9.1