From a139386706792d6a82caa3de2686446dbe34083a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 25 十一月 2025 12:27:12 +0800
Subject: [PATCH] #pda查看缓存库存
---
src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java | 3 ++-
src/main/java/com/zy/asrs/controller/OpenController.java | 4 +---
src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
4 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7253df4..ffdc932 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -480,9 +480,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
+
List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
if (!list.isEmpty()) {
return R.ok(list);
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
index bfda81e..8ec6c8e 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
@@ -7,6 +7,7 @@
@Data
public class AgvLocListDetlParam {
- String locNo; //搴撲綅鍙�
+ private String locNo; //搴撲綅鍙�
+ private String locSys; //搴撲綅鐘舵��
private List<LocDetl> agvDetlList; //鏄庣粏
}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
index 0bd7885..ff676c4 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
@@ -6,6 +6,6 @@
@Data
public class AgvLocListParam {
- private List<String> locNoList; // 闇�瑕佹煡璇㈢殑 AGV 搴撲綅
+ private String locNo; // 闇�瑕佹煡璇㈢殑 AGV 搴撲綅
String locSys; //搴撲綅鐘舵��
}
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..7674759 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
@@ -816,32 +818,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