From f532f32fc3769679c3c33c7b0e91c4e33530bf92 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 十月 2024 13:56:18 +0800
Subject: [PATCH] #摄像头pic存储增加locNo
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 19 ++++++++++++++++---
zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js | 7 +++++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/dto/LocPicDto.java | 14 ++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java | 2 +-
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/dto/LocPicDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/dto/LocPicDto.java
new file mode 100644
index 0000000..e086dea
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/dto/LocPicDto.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.common.wms.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LocPicDto {
+
+ private String locNo;
+
+ private List<String> pics;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 6b784d5..4f927f8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
import com.zy.asrs.common.domain.param.LocMastInitParam;
+import com.zy.asrs.common.wms.dto.LocPicDto;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.LocMast;
import com.zy.asrs.common.wms.entity.Mat;
@@ -228,15 +229,27 @@
return R.error();
}
- ArrayList<String> list = new ArrayList<>();
+ List<LocPicDto> list = new ArrayList<>();
String picStr = locMast.getPic();
if (Cools.isEmpty(picStr)) {
return R.ok().add(list);
}
List<String> pics = JSON.parseArray(picStr, String.class);
for (String pic : pics) {
- list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
- list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ List<String> picList = new ArrayList<>();
+ String[] split = pic.split("_");
+ String picPath = split[0];
+ String locNoStr = "";
+ if (split.length > 1) {
+ locNoStr = split[1];
+ }
+ picList.add("http://" + WCS_URL + "/image/" + picPath + "-1.jpg");
+ picList.add("http://" + WCS_URL + "/image/" + picPath + "-2.jpg");
+
+ LocPicDto locPicDto = new LocPicDto();
+ locPicDto.setLocNo(locNoStr);
+ locPicDto.setPics(picList);
+ list.add(locPicDto);
}
return R.ok().add(list);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java
index 4ec91ad..e294719 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java
@@ -75,7 +75,7 @@
}
//鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLev1, lev).eq(LocMast::getHostId, getHostId()));
+ List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLev1, lev).eq(LocMast::getHostId, getHostId()).in(LocMast::getRow1, 1, 2, 3, 4));
for (LocMast locMast : locMasts) {
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
diff --git a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
index 1ebf4e3..1da228a 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -182,8 +182,11 @@
success: function (res) {
if (res.code === 200){
res.data.forEach((item) => {
- let tmp = '<img width="600" src="' + item + '" />';
- imgHtml += tmp;
+ let locNo = item.locNo;
+ item.pics.forEach((pic) => {
+ let tmp = '<div><div><img width="600" src="' + pic + '" /></div><div>' + locNo + '</div></div>';
+ imgHtml += tmp;
+ })
})
imgHtml += "</div>";
--
Gitblit v1.9.1