#

yxFwq

2024-11-28 44de068cf2e04fc3e9c6fa7f44e0c1a4d241f989

#

 src/main/java/com/zy/asrs/domain/enums/LedErrorAreaType.java

New file
@@ -0,0 +1,33 @@
package com.zy.asrs.domain.enums;

import com.zy.core.enums.RgvModeType;

/**
 * RGV状态枚举
 */
public enum LedErrorAreaType {

    // 其他
    ONE_OTHER("1"),
    // 入库
    TWO_PAKIN("2"),
    // 出库
    THREE_PAKOUT("3"),
    // 扫码
    FOUR_BARCODE("4"),
    ;

    private String desc;
    LedErrorAreaType(String desc){
        this.desc = desc;
    }

    public String getDesc() {
        return desc;
    }

    public void setDesc(String desc) {
        this.desc = desc;
    }

}

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

@@ -8,6 +8,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.LedErrorAreaType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
@@ -193,13 +194,7 @@
                // 退回
                if (back) {
                    // led 异常显示
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                    if (ledThread != null) {
                        ErrMsg errMsg1 = new ErrMsg();
                        errMsg1.setErrMsg(errMsg);
                        errMsg1.setArea("1");
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                    }
                    LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
                    continue;
                }

@@ -290,13 +285,7 @@
                            }
                        } else {
                            // led 异常显示
                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("入库请求失败"+jsonObject.getInteger("code"));
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
                            LedErrorThreadUtil.ledErrorThread("入库请求失败"+jsonObject.getInteger("code"),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }

@@ -345,7 +334,7 @@

                // 尺寸检测异常
                boolean back = false;
                String errMsg = "异常：";
                String errMsg = inSta.getStaNo()+"站点：";
                if (staProtocol.isFrontErr()) {
                    errMsg = errMsg+"前超限；";
                    back = true;
@@ -377,13 +366,7 @@
                // 退回
                if (back) {
                    // led 异常显示
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                    if (ledThread != null) {
                        ErrMsg errMsg1 = new ErrMsg();
                        errMsg1.setErrMsg(errMsg);
                        errMsg1.setArea("1");
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                    }
                    LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
                    continue;
                }

@@ -500,13 +483,7 @@
                            }
                        } else {
                            // led 异常显示
                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("入库请求失败"+jsonObject.getInteger("code"));
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
                            LedErrorThreadUtil.ledErrorThread("入库请求失败"+jsonObject.getInteger("code"),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }

@@ -560,7 +537,7 @@

                // 尺寸检测异常
                boolean back = false;
                String errMsg = "异常：";
                String errMsg = inSta.getStaNo()+"站点：";
                if (staProtocol.isFrontErr()) {
                    errMsg = errMsg+"前超限；";
                    back = true;
@@ -592,13 +569,7 @@
                // 退回
                if (back) {
                    // led 异常显示
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                    if (ledThread != null) {
                        ErrMsg errMsg1 = new ErrMsg();
                        errMsg1.setErrMsg(errMsg);
                        errMsg1.setArea("1");
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                    }
                    LedErrorThreadUtil.ledErrorThread(errMsg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
                    continue;
                }

@@ -626,6 +597,8 @@
//                        if (!result) {
//                            throw new CoolException("更新plc站点信息失败");
//                        }
                        String msg =inSta.getStaNo()+"站点条码异常,条码="+barcode;
                        LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(), LedErrorAreaType.FOUR_BARCODE.getDesc());
                        continue;
                    }

@@ -634,15 +607,17 @@
                    if (wrkMast111 != null) {
                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(wrkMast111.getWrkNo());
                        staProtocol.setStaNo(wrkMast111.getStaNo());
                        StaProtocol staProtocol1 = new StaProtocol();
                        staProtocol1.setSiteId(staProtocol.getSiteId());
                        staProtocol1.setWorkNo(wrkMast111.getWrkNo());
                        staProtocol1.setStaNo(wrkMast111.getStaNo());

                        devpThread.setPakMk(staProtocol.getSiteId(), false,637);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        devpThread.setPakMk(staProtocol1.getSiteId(), false,637);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
                        if (!result) {
                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("更新plc站点信息失败!站点好："+inSta.getStaNo());
                                errMsg1.setErrMsg("更新plc站点信息失败!站点号："+inSta.getStaNo());
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
@@ -655,6 +630,8 @@
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    if (wrkMast != null) {
                        log.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        String msg ="工作档中已存在"+inSta.getStaNo()+"站点数据,工作号="+wrkMast.getWrkNo();
                        LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(),LedErrorAreaType.TWO_PAKIN.getDesc());
                        continue;
                    }
//                    // 获取入库通知档
@@ -684,43 +661,45 @@
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);

                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                            StaProtocol staProtocol1 = new StaProtocol();
                            staProtocol1.setSiteId(staProtocol.getSiteId());

                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol1.setWorkNo(dto.getWorkNo());

                            if(Cools.isEmpty(dto.getRgvNo()) || dto.getRgvNo() <= 0) {
                                staProtocol.setStaNo(dto.getStaNo());
                                staProtocol1.setStaNo(dto.getStaNo());
                            } else {//如果存在RGV编号，说明需要RGV接驳，先下发任务到RGV源站
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                                staProtocol1.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false,695);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            devpThread.setPakMk(staProtocol1.getSiteId(), false,695);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
                            if (!result) {
                                LedErrorThreadUtil.ledErrorThread("更新plc站点信息失败!站点号："+inSta.getStaNo(),inSta.getLed(),LedErrorAreaType.ONE_OTHER.getDesc());
                                throw new CoolException("更新plc站点信息失败");
                            }
                            try{
                                if (ledThread != null) {
                                    ErrMsg errMsg1 = new ErrMsg();
                                    errMsg1.setErrMsg("更新plc站点信息失败!站点好："+inSta.getStaNo());
                                    errMsg1.setArea("1");
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                                }
                                throw new CoolException("更新plc站点信息失败");
                            } catch (Exception e){
                                log.error("入库成功!电视机信息更新失败，小料箱入库！！！request：{}；response：{}",JSON.toJSONString(param), response);
                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/pair/station/single/loc/v1", JSON.toJSONString(param), response);
                            String msg = inSta.getStaNo()+"站点："+jsonObject.getString("msg");
                            LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(), LedErrorAreaType.TWO_PAKIN.getDesc());
                            Thread.sleep(1000);
                        }

                    } catch (Exception e) {
                        e.printStackTrace();
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    }

                }


            }
        }

    }

    /**
@@ -760,7 +739,7 @@

                // 尺寸检测异常
                boolean back = false;
                String errMsg = "异常：";
                String errMsg = inSta.getStaNo()+"站点：";
                if (staProtocol.isFrontErr()) {
                    errMsg = errMsg+"前超限；";
                    back = true;
@@ -796,7 +775,7 @@
                    if (ledThread != null) {
                        ErrMsg errMsg1 = new ErrMsg();
                        errMsg1.setErrMsg(errMsg);
                        errMsg1.setArea("1");
                        errMsg1.setArea("4");
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                    }
                    continue;
@@ -840,16 +819,18 @@
                    if (wrkMast != null) {
                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(wrkMast.getStaNo());
                        StaProtocol staProtocol1 = new StaProtocol();
                        staProtocol1.setWorkNo(wrkMast.getWrkNo());
                        staProtocol1.setStaNo(wrkMast.getStaNo());
                        staProtocol1.setSiteId(staProtocol.getSiteId());

                        devpThread.setPakMk(staProtocol.getSiteId(), false,843);
                        log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol.getSiteId(),staProtocol.getWorkNo(),barcode);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        devpThread.setPakMk(staProtocol1.getSiteId(), false,843);
                        log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol1.getSiteId(),staProtocol1.getWorkNo(),barcode);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
                        if (!result) {
                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("更新plc站点信息失败!站点好："+inSta.getStaNo());
                                errMsg1.setErrMsg("更新plc站点信息失败!站点号："+inSta.getStaNo());
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
@@ -882,22 +863,33 @@
                        JSONObject jsonObject = JSON.parseObject(response);
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);

                            StaProtocol staProtocol1 = new StaProtocol();
                            staProtocol1.setSiteId(staProtocol.getSiteId());
                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol1.setWorkNo(dto.getWorkNo());

                            if(Cools.isEmpty(dto.getRgvNo()) || dto.getRgvNo() <= 0) {
                                staProtocol.setStaNo(dto.getStaNo());
                                staProtocol1.setStaNo(dto.getStaNo());
                            } else {//如果存在RGV编号，说明需要RGV接驳，先下发任务到RGV源站
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                                staProtocol1.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false,892);
                            log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol.getStaNo(),staProtocol.getWorkNo(),barcode);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            devpThread.setPakMk(staProtocol1.getSiteId(), false,892);
                            log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol1.getStaNo(),staProtocol1.getWorkNo(),barcode);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol1));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }
                            try{
                                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                                if (ledThread != null) {
                                    ErrMsg errMsg1 = new ErrMsg();
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                                }
                            } catch (Exception e){
                                log.error("入库成功!电视机信息更新失败，大料箱入库！！！request：{}；response：{}",JSON.toJSONString(param), response);
                            }

//                        } else  if (jsonObject.getInteger("code").equals(700)){
//                            SearchLocParam param2 = new SearchLocParam();
//                            param2.setBarcode(barcode);
@@ -926,15 +918,9 @@
//                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            String msg = jsonObject.getString("msg");
                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo()+"==》失败原因："+msg);
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
                            String msg = inSta.getStaNo()+"站点："+jsonObject.getString("msg");
                            LedErrorThreadUtil.ledErrorThread(msg,inSta.getLed(),LedErrorAreaType.TWO_PAKIN.getDesc());
                            Thread.sleep(1000);
                        }

                    } catch (Exception e) {

 src/main/java/com/zy/asrs/utils/LedErrorThreadUtil.java

New file
@@ -0,0 +1,33 @@
package com.zy.asrs.utils;

import com.alibaba.fastjson.JSON;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ErrMsg;
import com.zy.core.model.Task;
import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class LedErrorThreadUtil {

    /**
     * 检测货架码
     */
    public static void ledErrorThread(String msg,Integer ledId,String area){
        try{
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
            if (ledThread != null) {
                ErrMsg errMsg1 = new ErrMsg();
                errMsg1.setErrMsg(msg);
                errMsg1.setArea(area);
                MessageQueue.offer(SlaveType.Led, ledId, new Task(5, errMsg1));
            }
        } catch (Exception e){
            log.error("入库失败!电视机信息更新失败！！！ledId：{}；msg：{}",ledId, msg);
        }
    }


}

 src/main/resources/application.yml

@@ -257,13 +257,16 @@
    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[0]:
      staNo: 104
      led: ${wcs-slave.led[2].id}
    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[1]:
      staNo: 126
      led: ${wcs-slave.led[2].id}
    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[2]:
      staNo: 131
#    # 小料箱 双工位单伸 空板入库口1
      led: ${wcs-slave.led[2].id}
    #    # 小料箱 双工位单伸 空板入库口1
#    emptyInSingleSta[1]:
#      staNo: 173
    # 大料箱 双工位单伸 入库口1
@@ -281,15 +284,19 @@
    # 大料箱 双工位单伸 空板入库口1
    emptyInLargeSta[0]:
      staNo: 292
      led: ${wcs-slave.led[2].id}
    # 大料箱 双工位单伸 空板入库口2
    emptyInLargeSta[1]:
      staNo: 281
      led: ${wcs-slave.led[2].id}
    # 大料箱 双工位单伸 空板入库口2
    emptyInLargeSta[2]:
      staNo: 310
      led: ${wcs-slave.led[2].id}
    # 大料箱 双工位单伸 空板入库口2
    emptyInLargeSta[3]:
      staNo: 312
      led: ${wcs-slave.led[2].id}
  # 输送线
  devp[1]:
    id: 2