#

lsh

2024-06-05 ffe9a5264dc70db4ec8623f358d8e7d78bf53599

#

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

@@ -3715,6 +3715,27 @@
                            }
                        }
                        Date date = new Date();

                        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvSlave.getDevpPlcId());
                        StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
                        if (staProtocol == null) {
                            log.info(date+"取放任务下发：未查询到站点信息："+wrkMastSta);
                            continue;
                        }
                        if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo() != 0){
                            continue;
                        }
                        if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                            if (staProtocol.isLoadingSuper()){
                                continue;
                            }
                        }
                        if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                            if (!staProtocol.isEmptyMk()){
                                continue;
                            }
                        }

                        log.info(date+"取放任务下发：小车工作档："+wrkMastSta);
                        log.info(date+"取放任务下发：目标站状态："+basDevp);
                        boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta);
@@ -3798,6 +3819,27 @@
                                }
                            }
                            Date date = new Date();

                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvSlave.getDevpPlcId());
                            StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
                            if (staProtocol == null) {
                                log.info(date+"拆盘任务下发：未查询到站点信息："+wrkMastSta);
                                continue;
                            }
                            if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo() != 0){
                                continue;
                            }
                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                                if (staProtocol.isLoadingSuper()){
                                    continue;
                                }
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!staProtocol.isEmptyMk()){
                                    continue;
                                }
                            }

                            log.info(date+"拆盘任务下发：小车工作档："+wrkMastSta);
                            log.info(date+"拆盘任务下发：目标站状态："+basDevp);
                            sign = rgvPutEmpty(rgvProtocol.getRgvNo(),wrkMastSta);//拆盘
@@ -3885,6 +3927,27 @@
                                }
                            }
                            Date date = new Date();

                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvSlave.getDevpPlcId());
                            StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
                            if (staProtocol == null) {
                                log.info(date+"满放任务下发：未查询到站点信息："+wrkMastSta);
                                continue;
                            }
                            if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo() != 0){
                                continue;
                            }
                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                                if (staProtocol.isLoadingSuper()){
                                    continue;
                                }
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!staProtocol.isEmptyMk()){
                                    continue;
                                }
                            }

                            log.info(date+"满放任务下发：小车工作档："+wrkMastSta);
                            log.info(date+"满放任务下发：目标站状态："+basDevp);
                            sign = rgvPutEmptyFull(rgvProtocol.getRgvNo(),wrkMastSta);
@@ -3964,6 +4027,22 @@
                                }
                            }
                            Date date = new Date();

                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvSlave.getDevpPlcId());
                            StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
                            if (staProtocol == null) {
                                log.info(date+"叠盘任务下发：未查询到站点信息："+wrkMastSta);
                                continue;
                            }
                            if (!staProtocol.isAutoing() || !staProtocol.isLoading()){
                                continue;
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!staProtocol.isEmptyMk()){
                                    continue;
                                }
                            }

                            log.info(date+"叠盘任务下发：小车工作档："+wrkMastSta);
                            log.info(date+"叠盘任务下发：目标站状态："+basDevp);
                            sign = rgvTakeEmpty(rgvProtocol.getRgvNo(),wrkMastSta);//叠盘
@@ -4045,6 +4124,17 @@
                                continue;
                            }
                            Date date = new Date();

                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvSlave.getDevpPlcId());
                            StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
                            if (staProtocol == null) {
                                log.info(date+"满取任务下发：未查询到站点信息："+wrkMastSta);
                                continue;
                            }
                            if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                continue;
                            }

                            log.info(date+"满取任务下发：小车工作档："+wrkMastSta);
                            log.info(date+"满取任务下发：目标站状态："+basDevp);
                            sign = rgvTakeEmptyFull(rgvProtocol.getRgvNo(),wrkMastSta);

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

@@ -22,6 +22,8 @@

    private Boolean demo;

    private Integer devpPlcId;

    // RGV入库源站点
    private List<RgvStn> rgvInSStn = new ArrayList<>();


 src/main/resources/application.yml

@@ -291,6 +291,7 @@
    port: 502
    rack: 0
    slot: 0
    devpPlcId: ${wcs-slave.devp[0].id}
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
@@ -319,6 +320,7 @@
    port: 502
    rack: 0
    slot: 0
    devpPlcId: ${wcs-slave.devp[0].id}
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}