#

zjj

2023-11-17 a8b604dba89260b486244926ec5bff5a121eb71a

#

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

@@ -400,38 +400,7 @@
                    log.error("查询工作档数据不符合条件--入出类型/目标库位号, 工作号={}，源库位={}，入出类型={}", taskWrk.getWrkNo(), taskWrk.getTargetPoint(), taskWrk.getIoType());
                    continue;
                }
                // 获取源库位信息
                String locNo = taskWrk.getStartPoint();
                LocMast sourceSta = locMastService.selectById(locNo);
                if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
                    log.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", locNo, sourceSta.getLocSts());
                    continue;
                }

                // 获取目标库位信息
                String locNoEnd = taskWrk.getTargetPoint();
                LocMast sourceEnd = locMastService.selectById(locNoEnd);
                if (!sourceEnd.getLocSts().equals("S") && !sourceEnd.getLocSts().equals("Q")) {
                    log.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", locNo, sourceSta.getLocSts());
                    continue;
                }


//                // 获取堆垛机出库站信息
//                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
//                StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
//                if (staProtocol == null) {
//                    break;
//                } else {
//                    staProtocol = staProtocol.clone();
//                }

                // 查询站点详细信息
                BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
                if (staDetl == null) {
                    log.error("出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
                    continue;
                }
                // 命令下发区 --------------------------------------------------------------------------

                // 堆垛机控制过滤
@@ -444,38 +413,6 @@
                    continue;
                }

                // 起始深库位浅库位不为空
                if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
                    // 获取浅库位信息
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
                    LocMast shallowLocMast = locMastService.selectById(shallowLocNo);
                    if (!shallowLocMast.getLocSts().equals("O")) {
                        log.error("移库操作起始库位浅库位状态不符合--状态, 库位号={}，库位状态={}", locNo, shallowLocMast.getLocSts());
                        continue;
                    }
                }

                // 目标库位为深库位且浅库位不为空
                if (Utils.isDeepLoc(slaveProperties, taskWrk.getTargetPoint())) {
                    // 获取浅库位信息
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getTargetPoint());
                    LocMast shallowLocMast = locMastService.selectById(shallowLocNo);
                    if (!shallowLocMast.getLocSts().equals("O")) {
                        log.error("移库操作目标库位浅库位状态不符合--状态, 库位号={}，库位状态={}", locNo, shallowLocMast.getLocSts());
                        continue;
                    }
                }

                // 目标库位为浅库位且深库位无货
                if (Utils.isShallowLoc(slaveProperties, taskWrk.getTargetPoint())) {
                    // 获取深库位信息
                    String deepLocNo = Utils.getDeepLoc(slaveProperties, taskWrk.getTargetPoint());
                    LocMast deepLocMast = locMastService.selectById(deepLocNo);
                    if (!deepLocMast.getLocSts().equals("F") && !deepLocMast.getLocSts().equals("D") ) {
                        log.error("移库操作目标库位深库位状态不符合--状态, 库位号={}，库位状态={}", locNo, deepLocMast.getLocSts());
                        continue;
                    }
                }

                // 1.堆垛机开始移动
                CrnCommand crnCommand = new CrnCommand();
@@ -483,12 +420,12 @@
                crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 源库位排
                crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 源库位列
                crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 源库位层
                crnCommand.setDestinationPosX(sourceEnd.getRow1().shortValue());     // 目标库位排
                crnCommand.setDestinationPosY(sourceEnd.getBay1().shortValue());     // 目标库位列
                crnCommand.setDestinationPosZ(sourceEnd.getLev1().shortValue());     // 目标库位层
                crnCommand.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint()));     // 源库位排
                crnCommand.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint()));     // 源库位列
                crnCommand.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint()));     // 源库位层
                crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint()));     // 目标库位排
                crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint()));     // 目标库位列
                crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint()));     // 目标库位层
                if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
                } else {

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

@@ -148,6 +148,13 @@
        throw new RuntimeException("库位解析异常");
    }

    public static Short getRowShort(String locNo) {
        if (!Cools.isEmpty(locNo)) {
            return Short.valueOf(locNo.substring(0, 2));
        }
        throw new RuntimeException("库位解析异常");
    }

    /**
     * 通过库位号获取 列
     */
@@ -169,6 +176,26 @@
    }

    /**
     * 通过库位号获取 列
     */
    public static short getBayShort(String locNo) {
        if (!Cools.isEmpty(locNo)) {
            return Short.parseShort(locNo.substring(2, 5));
        }
        throw new RuntimeException("库位解析异常");
    }

    /**
     * 通过库位号获取 层
     */
    public static short getLevShort(String locNo) {
        if (!Cools.isEmpty(locNo)) {
            return Short.parseShort(locNo.substring(5, 7));
        }
        throw new RuntimeException("库位解析异常");
    }

    /**
     * 当检索到双深库位的浅库位时，如果深库位无货，则放入对应的深库位
     */
    public static void toDeepIfEmptyByShallow(String shallowLoc) {

 src/main/resources/application-prod.yml

@@ -220,7 +220,7 @@
      scale: ${wcs-slave.scale[1].id}
      staNo: 105
      barcode: ${wcs-slave.barcode[1].id}
      slot: 0
      #slot: 0
    inSta[2]: #入库口1
      scale: ${wcs-slave.scale[0].id}
      staNo: 109
@@ -233,7 +233,7 @@
      scale: ${wcs-slave.scale[1].id}
      staNo: 117
      barcode: ${wcs-slave.barcode[1].id}
      slot: 0
      #slot: 0
    inSta[5]: #入库口1
      scale: ${wcs-slave.scale[0].id}
      staNo: 121
@@ -268,7 +268,7 @@
      scale: ${wcs-slave.scale[1].id}
      staNo: 306
      barcode: ${wcs-slave.barcode[1].id}
      slot: 0
      #slot: 0
    outSta[0]: #出库口1
      staNo: 307
  devp[3]: #输送线
@@ -283,7 +283,7 @@
      scale: ${wcs-slave.scale[1].id}
      staNo: 406
      barcode: ${wcs-slave.barcode[1].id}
      slot: 0
      #slot: 0
    outSta[0]: #出库口1
      staNo: 407
  scale[0]: #磅秤