#

lty

昨天 feb9933a4640c0d02eace5a9a3ade4a8a33890ea

#

 pom.xml

@@ -112,8 +112,18 @@
            <artifactId>truelicense-core</artifactId>
            <version>1.33</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-websocket</artifactId>
        </dependency>
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
            <version>5.8.26</version>
        </dependency>
    </dependencies>


    <build>
        <finalName>ddthwms</finalName>
        <plugins>

 src/main/java/com/zy/asrs/entity/TaskMsg.java

New file
@@ -0,0 +1,26 @@
package com.zy.asrs.entity;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

@Data
public class TaskMsg {
    /**
     * 仓库编码
     */
    @JsonProperty(value = "warehouse")
    private String warehouse;

    /**
     * 库口编码
     */
    @JsonProperty(value = "portCode")
    private String portCode;

    /**
     * 任务号
     *
     */
    @JsonProperty(value = "taskNo")
    private String taskNo;
}

 src/main/java/com/zy/asrs/entity/param/MatDto.java

New file
@@ -0,0 +1,80 @@
package com.zy.asrs.entity.param;

import lombok.Data;

/**
 * Created by vincent on 2020/8/6
 */
@Data
public class MatDto {

    // 物料编号
    private String matnr;

    // 物料名称
    private String maknx;

    private String batch;

    private String specs;

    // 客户信息
    private String manu;

    // 备注
    private String memo;

    // 物料数量
    private Double count;

    private Double total;

    private String orderNo;

    private String customer;

    public MatDto() {
    }
    public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
        this.matnr = matnr;
        this.maknx = maknx;
        this.batch = batch;
        this.specs = specs;
        this.manu = manu;
        this.memo = memo;
        this.count = count;
        this.total = total;
    }

    public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total, String orderNo, String customer) {
        this.matnr = matnr;
        this.maknx = maknx;
        this.batch = batch;
        this.specs = specs;
        this.manu = manu;
        this.memo = memo;
        this.count = count;
        this.total = total;
        this.orderNo = orderNo;
        this.customer = customer;
    }

    public MatDto(String matNo, String maknx, Double count) {
        this.matnr = matNo;
        this.maknx = maknx;
        this.count = count;
    }
    public MatDto(String matNo, String maknx, Double count, String specs) {
        this.specs = specs;
        this.matnr = matNo;
        this.maknx = maknx;
        this.count = count;
    }
    public MatDto(String matNo, String maknx, Double count, Double total, String specs) {
        this.specs = specs;
        this.matnr = matNo;
        this.maknx = maknx;
        this.count = count;
        this.total = total;
    }
}

 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -28,6 +28,7 @@
    List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);

    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
    List<WrkDetl> findByWorkNo(Integer workNo);

    int updateIoTime(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);


 src/main/java/com/zy/asrs/service/WrkDetlService.java

@@ -27,6 +27,7 @@
    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);

    boolean updateIoTime(Integer workNo, Date ioTime);
    List<WrkDetl> findByWorkNo(Integer wrkNo);


}

 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java

@@ -89,7 +89,10 @@
    public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
    }

    @Override
    public List<WrkDetl> findByWorkNo(Integer workNo) {
        return this.baseMapper.findByWorkNo(workNo);
    }
    @Override
    public boolean updateIoTime(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTime(workNo, ioTime) > 0;

 src/main/java/com/zy/asrs/webSocketConfig/LedCommand.java

New file
@@ -0,0 +1,53 @@
package com.zy.asrs.webSocketConfig;

import com.core.common.Cools;
import com.zy.asrs.entity.param.MatDto;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

/**
 * led命令报文
 * Created by vincent on 2020/8/11
 */
@Data
public class LedCommand extends Object {

    private String title;

    private Integer workNo;

    private Integer staNo;

    private Integer sourceStaNo;

    private String locNo;

    private String sourceLocNo;

    private List<MatDto> matDtos = new ArrayList<>();

    private boolean emptyMk = false;

    private Integer ioType;
    private String barcode;

    @Override
    public String toString() {
        StringBuffer s = new StringBuffer();
        s.append("工作号[" + this.workNo + "]\n");
        s.append("工作类型[" + this.title + "]\n");
        if (!Cools.isEmpty(this.barcode)) {
            s.append("托盘码[" + this.barcode + "]\n");
        }
        if (!this.emptyMk){

            for (MatDto matDto : matDtos) {
                s.append("[商品编码:" + matDto.getMatnr() + ", 数量:" + matDto.getCount() + "]\n");
            }
        }

        return s.toString();
    }
}

 src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java

New file
@@ -0,0 +1,285 @@
package com.zy.asrs.webSocketConfig;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WorkChartAxis;
import com.zy.asrs.entity.LocChartPie;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.MatDto;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@Component
@Slf4j
public class LedWebsocket {

    private static final String[] WEEK = {"星期日","星期一","星期二","星期三","星期四","星期五","星期六"};

    @Autowired
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private WebSocketServer webSocketServer;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Value("${led.id}")
    private String ledId;

    @Scheduled(cron = "0/2 * * * * ? ")
    private void send() {

        //饼图
        List<Map<String, Object>> pie = new ArrayList<>();
        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
            map.put("value", locUseRate.getFqty());
            pie.add(map);

            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空");
            map1.put("value", locUseRate.getOqty());
            pie.add(map1);

            Map<String, Object> map2 = new HashMap<>();
            map2.put("name", "使用");
            map2.put("value", locUseRate.getUqty());
            pie.add(map2);

            Map<String, Object> map3 = new HashMap<>();
            map3.put("name", "禁用");
            map3.put("value", locUseRate.getXqty());
            pie.add(map3);
        }
        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
        Integer used = locUseRate.getFqty() + locUseRate.getUqty();
        // 库位使用率
        double usedDivides = Arith.divides(3, used, total);
        double usedPr = Arith.multiplys(1, usedDivides, 100);

        //折线图
        Map<String,Object> map=new HashMap<String, Object>();
        List<AxisBean> list = new ArrayList<AxisBean>();
        List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();

        if(listChart!=null) {
            ArrayList<Integer> data1 = new ArrayList<Integer>();
            ArrayList<Integer> data2 = new ArrayList<Integer>();

            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
            Calendar calendar = Calendar.getInstance();
            calendar.add(Calendar.DATE, -12);
            for(int i=0;i<12;i++) {
                boolean flag = true;
                calendar.add(Calendar.DATE, 1);
                String str = sf.format(calendar.getTime());
                for(WorkChartAxis workChart : listChart) {
                    if(str.equals(workChart.getYmd())) {
                        data1.add(workChart.getInqty());
                        data2.add(workChart.getOutqty());
                        flag = false;
                        break;
                    }
                }
                if(flag) {
                    data1.add(0);
                    data2.add(0);
                }
            }
            AxisBean inqty = new AxisBean();
            inqty.setName("入库数量");
            Integer[] array1 = new Integer[data1.size()];
            inqty.setData(data1.toArray(array1));
            list.add(inqty);
            AxisBean outqty = new AxisBean();
            outqty.setName("出库数量");
            Integer[] array2 = new Integer[data2.size()];
            outqty.setData(data2.toArray(array2));
            list.add(outqty);
        }
        //仓库数据
        EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
        locDetlEntityWrapper.setSqlSelect("TOP 5 matnr,SUM(anfme) as matnrCount").groupBy("matnr").orderBy("matnrCount",false);
        List<Map<String, Object>>  selectMap = locDetlService.selectMaps(locDetlEntityWrapper);

        Date now = new Date();
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(now);
//         Map<String, Object> map = new HashMap<>();
         map.put("to","all");
         map.put("message", Cools.add("type", "default").add("pie", pie)
                 .add("stockCunt", locUseRate.getFqty())
                 .add("emptyCount", locUseRate.getOqty())
                 .add("noneCount", locUseRate.getXqty())
                 .add("total", total)
                 .add("used", used)
                 .add("usedPr", usedPr)
                 .add("rows",list)
                 .add("year", calendar.get(Calendar.YEAR))
                 .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH)+1), 2))
                 .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
                 .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
                 .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
                 .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)) , 2))
                 .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK)-1])
                 .add("inventoryData",selectMap));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,"all");

    }

    @Scheduled(cron = "0/2 * * * * ? ")
    private void ErrorSend(){
        Map<String,Object> map=new HashMap<>();
        map.put("to",ledId);
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId).eq("dev_mk","N"));
        if (basDevp == null ){
            return;
        }
        map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
    }


    @Scheduled(cron = "0/2 * * * * ? ")
    private void TaskSend(){
        Map<String,Object> map=new HashMap<>();
        map.put("to",ledId);
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId).eq("dev_mk","Y"));
        if (basDevp == null ){
            return;
        }
        if (basDevp.getDevMk().equals("O")){
            basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
        }


        List<LedCommand> commandList = new ArrayList<>();

        if (basDevp.getWrkNo() != 0 && basDevp.getLoading().equals("Y")){
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
            if (null != wrkMast){
                commandList = getCommandList(basDevp.getWrkNo().toString());
            }
        }
        map.put("message",Cools.add("type", "task").add("taskList",commandList));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
    }

    public List<LedCommand> getCommandList(String taskNo){
        List<LedCommand> commands = new ArrayList<>();
        // 工作档集合
        List<WrkMast> wrkMasts = new ArrayList<>();
        // 获取工作档数据
        WrkMast wrkMast = wrkMastService.selectById(taskNo);
        if (null == wrkMast) { return null; }
        wrkMasts.add(wrkMast);
        // 组装命令
        LedCommand ledCommand = new LedCommand();
        ledCommand.setWorkNo(wrkMast.getWrkNo());
        ledCommand.setIoType(wrkMast.getIoType());
        wrkMasts.add(wrkMast);
        // 出库模式
        switch (wrkMast.getIoType()) {
            case 1:
                ledCommand.setTitle("全板入库");
                break;
            case 10:
                ledCommand.setTitle("空板入库");
                break;
            case 101:
                ledCommand.setTitle("全板出库");
                break;
            case 103:
                ledCommand.setTitle("拣料出库");
                break;
            case 104:
                ledCommand.setTitle("并板出库");
                break;
            case 107:
                ledCommand.setTitle("盘点出库");
                break;
            case 110:
                ledCommand.setTitle("空板出库");
                ledCommand.setEmptyMk(true);
                break;
            default:
                break;
        }
        ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
        ledCommand.setStaNo(wrkMast.getStaNo());
        ledCommand.setBarcode(wrkMast.getBarcode());
        if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
            List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());

            wrkDetls.forEach(wrkDetl -> {
                Double total = 0.0;
                EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                if (Cools.isEmpty(locDetl)) {
                    total = wrkDetl.getAnfme();
                } else {
                    total = locDetl.getAnfme();
                }
                if (!Cools.isEmpty(wrkDetl.getOrderNo())){
                    OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
                            .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
                    if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                    }
                    if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                    }
                    if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                    }
                }else {
                    if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                    }
                    if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                    }
                    if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                    }
                }
            });
        }
        commands.add(ledCommand);

        Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
        // 修改主档led标记
        for (WrkMast wrkMast1 : wrkMasts) {
            wrkMast1.setOveMk("Y");
            wrkMast1.setModiTime(new Date());
            if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
                throw new CoolException("更新工作档失败");
            }
        }

        return commands;
    }
}

 src/main/java/com/zy/asrs/webSocketConfig/WebSocketConfig.java

New file
@@ -0,0 +1,17 @@
package com.zy.asrs.webSocketConfig;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;

@Configuration
public class WebSocketConfig {
    /**
     * 注入一个ServerEndpointExporter,该Bean会自动注册使用@ServerEndpoint注解申明的websocket endpoint
     */
    @Bean
    public ServerEndpointExporter serverEndpointExporter() {
        return new ServerEndpointExporter();
    }
}


 src/main/java/com/zy/asrs/webSocketConfig/WebSocketServer.java

New file
@@ -0,0 +1,116 @@
package com.zy.asrs.webSocketConfig;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

import javax.websocket.*;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

@ServerEndpoint(value = "/led/{username}")
@Component
@Service
public class WebSocketServer {
    private static final Logger log = LoggerFactory.getLogger(WebSocketServer.class);
    /**
     * 记录当前在线连接数
     */
    public static final Map<String, Session> sessionMap = new ConcurrentHashMap<>();
    /**
     * 连接建立成功调用的方法
     */
    @OnOpen
    public void onOpen(Session session, @PathParam("username") String username) {
        sessionMap.put(username, session);
        log.info("有新用户加入，username={}, 当前在线人数为：{}", username, sessionMap.size());
        JSONObject result = new JSONObject();
        JSONArray array = new JSONArray();
        result.set("users", array);
        for (Object key : sessionMap.keySet()) {
            JSONObject jsonObject = new JSONObject();
            jsonObject.set("username", key);
            // {"username", "zhang", "username": "admin"}
            array.add(jsonObject);
        }
//        {"users": [{"username": "zhang"},{ "username": "admin"}]}
        sendAllMessage(JSONUtil.toJsonStr(result));  // 后台发送消息给所有的客户端
    }
    /**
     * 连接关闭调用的方法
     */
    @OnClose
    public void onClose(Session session, @PathParam("username") String username) {
        sessionMap.remove(username);
        log.info("有一连接关闭，移除username={}的用户session, 当前在线人数为：{}", username, sessionMap.size());
    }
    /**
     * 收到客户端消息后调用的方法
     * 后台收到客户端发送过来的消息
     * onMessage 是一个消息的中转站
     * 接受 浏览器端 socket.send 发送过来的 json数据
     * @param message 客户端发送过来的消息
     */
    @OnMessage
    public void onMessage(String message, Session session, @PathParam("username") String username) {
//        log.info("服务端收到用户username={}的消息:{}", username, message);
        JSONObject obj = JSONUtil.parseObj(message);
        String toUsername = obj.getStr("to"); // to表示发送给哪个用户，比如 admin
        String text = obj.getStr("message"); // 发送的消息文本  hello
        // {"to": "admin", "text": "聊天文本"}
        if ("heartBeat".equals(toUsername)) {
            log.info("心跳");
        }else if ("all".equals(toUsername)) {
            sendAllMessage(text);
        }else {
            Session toSession = sessionMap.get(toUsername); // 根据 to用户名来获取 session，再通过session发送消息文本
            if (toSession != null) {
                // 服务器端 再把消息组装一下，组装后的消息包含发送人和发送的文本内容
                // {"from": "zhang", "text": "hello"}
                JSONObject jsonObject = new JSONObject();
                jsonObject.set("from", username);  // from 是 zhang
                jsonObject.set("text", text);  // text 同上面的text
                this.sendMessage(text, toSession);
//            log.info("发送给用户username={}，消息：{}", toUsername, jsonObject.toString());
            } else {
//                log.info("发送失败，未找到用户username={}的session", toUsername);
            }
        }

    }
    @OnError
    public void onError(Session session, Throwable error) {
        log.error("发生错误");
        error.printStackTrace();
    }
    /**
     * 服务端发送消息给客户端
     */
    private void sendMessage(String message, Session toSession) {
        try {
//            log.info("服务端给客户端[{}]发送消息{}", toSession.getId(), message);
            toSession.getBasicRemote().sendText(message);
        } catch (Exception e) {
            log.error("服务端发送消息给客户端失败", e);
        }
    }
    /**
     * 服务端发送消息给所有客户端
     */
    private void sendAllMessage(String message) {
        try {
            for (Session session : sessionMap.values()) {
//                log.info("服务端给客户端[{}]发送消息{}", session.getId(), message);
                session.getBasicRemote().sendText(message);
            }
        } catch (Exception e) {
            log.error("服务端发送消息给客户端失败", e);
        }
    }
}

 src/main/java/com/zy/common/utils/RedisUtil.java

@@ -2,8 +2,10 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -13,13 +15,16 @@
 * redisTemplate封装
 *
 */
//@Component
@Component
public class RedisUtil {

    @Autowired
    private RedisTemplate<String, Object> redisTemplate;
//    @Autowired
//    private RedisTemplate<String, Object> redisTemplate;

    public RedisUtil(RedisTemplate<String, Object> redisTemplate) {
    @Autowired
    private RedisTemplate redisTemplate;

    public RedisUtil(RedisTemplate redisTemplate) {
        this.redisTemplate = redisTemplate;
    }

@@ -96,6 +101,21 @@
    }

    /**
     * 获取全部数据
     * @return
     */
    public HashMap<Object, Object> getRedis() {
        Set<String> keys = redisTemplate.keys("*");
        HashMap<Object, Object> map = new HashMap<>();
        for (String key : keys) {
            Object value = redisTemplate.opsForValue().get(key);
            map.put(key, value);
        }

        return map;//返回全部数据集合
    }

    /**
     * 普通缓存放入
     *
     * @param key   键

 src/main/java/com/zy/common/web/WcsController.java

@@ -213,7 +213,30 @@
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }
        return Re.ok();
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getPortCode()));
        if(param.getErrorMsg()!=null){
            basDevp.setDecDesc(param.getErrorMsg());
            basDevp.setDevMk("N");
        }
        return Re.ok(basDevpService.updateById(basDevp));
    }

    @PostMapping("/fromwcs/taskReport")
    @ResponseBody
    public synchronized Re taskReport(@RequestBody TaskMsg param){
        log.info("收到WCS任务入库异常上报===>>入参:{}",param);
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
        }
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getPortCode()));
        if(param.getTaskNo()!=null){
            basDevp.setWrkNo(Integer.valueOf(param.getTaskNo()));
            basDevp.setDevMk("Y");
        }
        return Re.ok(basDevpService.updateById(basDevp));
    }

    @PostMapping("/fromwcs/applyChangeEnd")

 src/main/resources/application.yml

@@ -61,7 +61,7 @@
#    {rowList: [8,9,10,11,12,13],minBay: 33,maxBay: 49},
  ]
  #是否开启wms下发任务给wcs
  workIssued-fig : true
  workIssued-fig : false
  #地址
  url : 10.10.10.122:8082
  #wms下发任务给wcs
@@ -94,6 +94,12 @@
comb:
  limit: 5000

led:
  ip: localhost
  url: ddthwms
  port: 8080
  id: 1001

#erp对接
erp:
  #  开关

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -130,5 +130,8 @@
        where 1=1
          and wrk_no = #{workNo}
    </update>
    <select id="findByWorkNo" resultMap="BaseResultMap">
        select wrk_no, matnr, maktx, anfme ,specs,batch from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
    </select>

</mapper>