#标记

yxFwq

2024-08-13 5c2d7ece5090ed84945e42a1f89af8c279dbcb9a

#标记

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

@@ -4835,8 +4835,28 @@
                            if (basJarMastService.selectJarMastOperation(jarSlave.getId(),2)!=0){
                                break;
                            }
                            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){
                            BasJar basJar = basJarMapper.selectById(jarSlave.getId());
                            int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
                            if (count>0){
                                break;
                            }
                            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){
                                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)==7){
                                    JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
                                    JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
                                    if (jarOtherProtocol == null) {
                                        break;
                                    }
                                    if (jarOtherProtocol.getJarTemperature()>jarTemperature){
                                        log.info("{}号硫化罐查询设备温度过高，等待降温....先执行入罐任务！！！",jarOtherProtocol.getJarNo());
                                    } else {
                                        if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>0){
                                            log.info("{}号硫化罐查询设备温度过高，先执行了入罐任务，执行完毕再进行冷却！！！",jarOtherProtocol.getJarNo());
                                        } else {
                                            break;
                                        }
                                    }
                                }
                            }
                            if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>=jarMaxLoc*2){
                                break;
@@ -5310,6 +5330,11 @@
                            return false;
                        }

                        int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
                        if (count>0){
                            return false;
                        }

                        //门作业  无
                        //自动、空闲、右门关闭、   Other左门关闭
                        if (jarProtocol.isAutoing() && jarProtocol.jarErr==0
@@ -5441,11 +5466,11 @@
            if (basJarMastList.size() != jarMaxLoc){
                return false;
            }
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
                return false;
            }
//            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
//                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
//                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
//                return false;
//            }

            BasJarMast basJarMastSign = basJarMastList.get(0);
            if (Cools.isEmpty(basJarMastSign)){
@@ -8162,7 +8187,38 @@
                    if(basJarMastList.isEmpty()){
                        if (wrkMastExecuteService.selectNoStartCharge(steSlave.getId())==0){
                            if (wrkMastExecuteService.selectMoveStart(steSlave.getId())==0){
                                continue;
                                boolean sign = true;
                                for (SteSlave.InStn inStn : steSlave.getSteInStn()){
                                    //检测站点状态
                                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, inStn.getDevpPlcId());
                                    StaProtocol staProtocol = devpThread.getStation().get(inStn.getStaNo());
                                    if (staProtocol == null) {
                                        continue;
                                    } else {
                                        staProtocol = staProtocol.clone();
                                    }
                                    if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
                                        // 获取硫化罐信息
                                        JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, inStn.getJarNo());
                                        JarProtocol jarProtocol = jarThread.getJarProtocol();
                                        if (jarProtocol == null) {
                                            continue;
                                        }
                                        if (jarProtocol.modeType != JarModeType.AUTO){
                                            continue;
                                        }
                                        if (jarProtocol.statusType .equals(JarStatusType.SOS)){
                                            continue;
                                        }
                                        if (jarProtocol.getJarTemperature()>jarTemperature){
                                            continue;
                                        }
                                        sign = false;
                                    }
                                }
                                if(sign){
                                    continue;
                                }
                            }
                        }
                    }

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

@@ -66,6 +66,7 @@
                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档

                    mainService.generateStoreWrkFile(); // 组托
//                    mainService.generateStoreWrkFile464(); // 组托464
                    mainService.generateStoreWrkFileSingle(); // 组托  双工位单伸   小料箱
                    mainService.generateStoreWrkFileLarge(); // 组托  双工位单伸   大料箱
//                    mainService.generateStoreWrkFile0(); // WMS入库

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

@@ -21,13 +21,13 @@
    private Boolean demo;

    // 穿梭车入库站点
    private List<CrnStn> steInStn = new ArrayList<>();
    private List<InStn> steInStn = new ArrayList<>();

    // 穿梭车出库站点
    private List<CrnStn> steOutStn = new ArrayList<>();
    private List<InStn> steOutStn = new ArrayList<>();

    @Data
    public static class CrnStn {
    public static class InStn {

        // 输送线plc编号
        private Integer devpPlcId;
@@ -35,6 +35,10 @@
        // 穿梭车站点编号
        private Integer staNo;

        private Integer rgvNo;

        private Integer jarNo;

        // 排
        private Integer row;


 src/main/resources/application.yml

@@ -311,6 +311,10 @@
    inSta[1]:
      staNo: 453
      barcode: ${wcs-slave.barcode[5].id}
    # 入库口464
    inSta464[0]:
      staNo: 464
      barcode: ${wcs-slave.barcode[6].id}
    # 入硫化罐RGV
    enterRgv[0]:
      rgvNo: 623
@@ -666,6 +670,20 @@
    port: 502
    rack: 0
    slot: 0
    # 入库站点
    steInStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 612
      rgvNo: 623
      jarNo: 1
      row: 3
    # 入库站点
    steInStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 615
      rgvNo: 623
      jarNo: 2
      row: 1
  # ste2
  ste[1]:
    id: 2
@@ -673,6 +691,20 @@
    port: 502
    rack: 0
    slot: 0
    # 入库站点
    steInStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 619
      rgvNo: 624
      jarNo: 3
      row: 3
    # 入库站点
    steInStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 622
      rgvNo: 624
      jarNo: 4
      row: 1
    # 磅秤
  scale[0]:
    id: 1