#摄像头pic存储增加locNo

Junjie

2024-10-30 f532f32fc3769679c3c33c7b0e91c4e33530bf92

#摄像头pic存储增加locNo

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/dto/LocPicDto.java

New file
@@ -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;

}

 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);
    }

 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();

 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>";