代码优化

dubin

2025-05-19 9efe3f1d2ccb7375e5d81df7b5c29723dd99cc89

代码优化

 src/main/java/com/zy/asrs/controller/MonitorController.java

@@ -103,8 +103,8 @@
        }

        // 获取输送线plc线程
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
        String ledContent = ledThread.getWorkNos().toString();
//        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
//        String ledContent = ledThread.getWorkNos().toString();
//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";

        return R.ok(
@@ -116,8 +116,8 @@
                .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1))   // 累计升降距离km
                .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1))    // 累计走行时长h
                .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1))    // 累计升降时长h
                .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容
                .add("content", ledContent) // 显示内容
//                .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容
//                .add("content", ledContent) // 显示内容
        );
    }


 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.model.DevpSlave;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -221,6 +222,7 @@
        HashMap<String,Object> map=new HashMap<>();
        List<CrnStatusParam> crnStatusParams=new ArrayList<>();
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        for (BasCrnp basCrnp:basCrnps){
            CrnStatusParam crnStatusParam=new CrnStatusParam();
            crnStatusParam.setCrnNo(basCrnp.getCrnNo());
@@ -234,7 +236,18 @@
            }
            crnStatusParams.add(crnStatusParam);
        }

        for (BasDevp basDevp : basDevps) {
            CrnStatusParam crnStatusParam=new CrnStatusParam();
            crnStatusParam.setDevpNo(basDevp.getDevNo());
            crnStatusParam.setOutEnable(basDevp.getOutEnable());
            crnStatusParam.setInEnable(basDevp.getInEnable());
            if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
                crnStatusParam.setCrnSts(3);
            }else{
                crnStatusParam.setCrnSts(2);
            }
            crnStatusParams.add(crnStatusParam);
        }
        map.put("ReturnStatus",0);
        map.put("ErrorMessage","");
        map.put("data",crnStatusParams);

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

@@ -4,8 +4,11 @@

@Data
public class CrnStatusParam {
    private Integer crnNo;
    private Integer crnSts;
    private Long errorCode;
    private String errorMsg;
    private Integer crnNo;//堆垛机设备号
    private Integer devpNo;//输送线设备号
    private Integer crnSts;//状态 1：单机 2：手动 3：联机
    private Long errorCode;//报警编码
    private String errorMsg;//报警内容
    private String outEnable;//可出 Y：可出 N：不可出
    private String inEnable;//可入 Y：可入 N：不可入
}

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

@@ -306,6 +306,8 @@
                    }
                    Short workNo = staProtocol.getWorkNo();
                    Short stano = staProtocol.getStaNo();
                    //led
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                    // 尺寸检测异常
                    boolean back = false;
@@ -364,6 +366,11 @@
                            if (back) {
                                storageEscalationParam.setWCSStatus(1);
                                storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
                                // led 异常显示
                                if (ledThread != null) {
                                    String errorMsg = errMsg;
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                }
                            }
                        }

@@ -436,6 +443,11 @@
                                            }
                                        }
                                    } else {
                                        // led 异常显示
                                        if (ledThread != null) {
                                            String errorMsg = "已有入库任务！！！";
                                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                        }
                                        staProtocol.setWorkNo((short) 9991);
                                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -443,6 +455,13 @@
                                    }

                                } else {

                                    // led 异常显示
                                    if (ledThread != null) {
                                        String errorMsg = jsonObject.getString("ErrorMessage");
                                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                    }

                                    staProtocol.setWorkNo((short) 9991);
                                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -502,6 +521,9 @@
                        staProtocol = staProtocol.clone();
                    }
                    Short workNo = staProtocol.getWorkNo();
                    //led
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading()
                            && staProtocol.isInEnable()
@@ -590,6 +612,11 @@
                                        }
                                    }
                                } else {
                                    // led 异常显示
                                    if (ledThread != null) {
                                        String errorMsg = "任务已存在！！！！";
                                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                    }
                                    staProtocol.setWorkNo((short) 9991);
                                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -597,6 +624,11 @@
                                }

                            } else {
                                // led 异常显示
                                if (ledThread != null) {
                                    String errorMsg = jsonObject.getString("ErrorMessage");
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                }
                                staProtocol.setWorkNo((short) 9991);
                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -1129,7 +1161,7 @@

                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                    //判断其库位是否为深库位，如果为深库位找其浅库位是都有货
                    if (locMast.getRow1() == 8 || locMast.getRow1() == 5) {
                    if (locMast.getRow1() == 5) {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("row1", (locMast.getRow1() + 1))
                                .eq("bay1", locMast.getBay1())
@@ -1139,6 +1171,16 @@
                            continue;
                        }
                    }
                    if (locMast.getRow1() == 8) {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("row1", (locMast.getRow1() - 1 ))
                                .eq("bay1", locMast.getBay1())
                                .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
                        if (!Cools.isEmpty(locMast1)) {
                            log.info(locMast.getLocNo() + "出深库位，浅库位有货");
                            continue;
                        }
                    }

                    // 获取堆垛机出库站信息
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -59,10 +59,10 @@
        for (Slave barcode : slaveProperties.getBarcode()) {
            MessageQueue.init(SlaveType.Barcode, barcode);
        }
//        // 初始化Led灯mq
//        for (Slave led : slaveProperties.getLed()) {
//            MessageQueue.init(SlaveType.Led, led);
//        }
        // 初始化Led灯mq
        for (Slave led : slaveProperties.getLed()) {
            MessageQueue.init(SlaveType.Led, led);
        }
//        // 初始化磅称mq
//        for (Slave scale : slaveProperties.getScale()) {
//            MessageQueue.init(SlaveType.Scale, scale);
@@ -95,13 +95,13 @@
//            new Thread(barcodeThread).start();
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        }
//        // 初始化LED线程
//        log.info("初始化LED线程...................................................");
//        for (LedSlave led : slaveProperties.getLed()) {
//            LedThread ledThread = new LedThread(led);
//            new Thread(ledThread).start();
//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
//        }
        // 初始化LED线程
        log.info("初始化LED线程...................................................");
        for (LedSlave led : slaveProperties.getLed()) {
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
        }
//        // 初始化磅秤线程
//        log.info("初始化磅秤线程...................................................");
//        for (Slave scale : slaveProperties.getScale()) {

 src/main/java/com/zy/core/model/DevpSlave.java

@@ -37,6 +37,9 @@
        private Integer scale;

        private Integer backSta;

        private Integer led;

    }

}

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -54,11 +54,11 @@
        add(1003);
        add(1004);
        add(1005);
        add(1010);
        add(1006);
        add(1007);
        add(1008);
        add(1009);
        add(1010);
        add(1011);
        add(1012);
        add(1013);

 src/main/resources/application-prod.yml

@@ -58,14 +58,14 @@
      backSta: 106
      devpPlcId: ${wcs-slave.devp[0].id}
    crnOutStn[1]: #堆垛机出库站点--2F输送线 放货口
      staNo: 2002
      row: 3
      staNo: 2013
      row: 4
      bay: 59
      lev: 11
      devpPlcId: ${wcs-slave.devp[1].id}
    crnInStn[1]: #堆垛机入库站点1--2F输送线 取货口
      staNo: 2003
      row: 4
      staNo: 2012
      row: 3
      bay: 59
      lev: 11
      backSta: 106
@@ -200,6 +200,7 @@
      staNo: 1052
      backSta: 1051
      barcode: ${wcs-slave.barcode[2].id}
      led: ${wcs-slave.led[0].id}
    inSta[1]: #空板入库口0
        staNo: 1058
    outSta[0]: #出库口1
@@ -254,6 +255,13 @@
    port: 51236
    ip: 172.17.91.39
    id: 4
  # LED1
  led[0]:
    id: 1
    ip: 192.168.110.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[2].id}
    staArr: 1052
#  crn[0]: #堆垛机1
#    rack: 0
#    offset: 2    #偏移量，当堆垛机站点列号=1时，偏移量=2

 src/main/resources/application.yml

@@ -53,7 +53,7 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 192.168.61.230:8078
  url: 192.168.0.98:8078/dfmp
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: other/api/wcs/allocation