#

zjj

2023-12-19 536ac7042e063ec9b9d370d6cd973d5c0b48e4fc

#

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

@@ -298,11 +298,11 @@
                        ,r.toString()
                        ,true
                );
                return r;


        }

        return null;
        return R.ok();
    }

    //任务取消接口

 src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java

@@ -32,7 +32,7 @@

    TaskWrk selectCrnStaWorking(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);

    TaskWrk selectCrnNoWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
    TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);

    List<TaskWrk> selectToBeHistoryData();


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

@@ -729,8 +729,15 @@
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) { continue; }

            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
                //获取入库待确认工作档
                TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
                if (Cools.isEmpty(taskWrk)) {
//                    log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
                    continue;
                }

                //获取指令ID
                Integer commandId = crnProtocol.getCommandId();

 src/main/java/com/zy/asrs/task/TaskLogScheduler.java

@@ -72,7 +72,7 @@
                    taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //源库位
                    //判断托盘是否走到出库站
                    BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", taskWrk.getTargetPoint()));
                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo()) && !basDevp.getOutEnable().equals("Y")){
                        continue;
                    }
                } else if (taskWrk.getIoType() ==3) {
@@ -93,7 +93,7 @@
                    locMast2.setBarcode(taskWrk.getBarcode());//托盘码
                    locMast2.setModiTime(now);
                    locMast2.setModiUser(9999L);
                    locMastService.updateById(locMast);
                    locMastService.updateById(locMast2);
                }

                taskOverToWms.setTaskStatus("done"); //任务状态

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

@@ -154,7 +154,7 @@
//            deviceErrorService.addDeviceError("crn", slave.getId(), "堆垛机plc连接失败");
            initCrnProtocol();
        }
        siemensNet.ConnectClose();
//        siemensNet.ConnectClose();
        return result;
    }

@@ -227,7 +227,7 @@
                        taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //任务号
                        taskOverToWms.setTaskType(tasktype); // 任务类型
                        taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 容器编码
                        if (taskWrk.getIoType() ==1 || taskWrk.getIoType() == 3){
                        if (taskWrk.getIoType() ==1){
                            taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //设备编码
                            taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //目标库位
                        }else if (taskWrk.getIoType() ==2){
@@ -242,6 +242,10 @@
                            map1.put(405,"G-1101");
                            taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //设备编码
                            taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //源库位
                        } else if (taskWrk.getIoType() == 3) {
                            taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //设备编码
                            taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint());
                            taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //目标库位
                        }
                        taskOverToWms.setTaskStatus("location_done"); //任务状态
                        String response = null;
@@ -316,6 +320,21 @@
            log.error("堆垛机写入命令为空");
            return false;
        }
        //转换前克隆一份
        CrnCommand crnCommand = new CrnCommand();
        crnCommand.setCrnNo(command.getCrnNo());
        crnCommand.setAckFinish(command.getAckFinish());
        crnCommand.setTaskNo(command.getTaskNo());
        crnCommand.setTaskMode(command.getTaskMode());
        crnCommand.setSourcePosX(command.getSourcePosX());
        crnCommand.setSourcePosY(command.getSourcePosY());
        crnCommand.setSourcePosZ(command.getSourcePosZ());
        crnCommand.setDestinationPosX(command.getDestinationPosX());
        crnCommand.setDestinationPosY(command.getDestinationPosY());
        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
//        crnCommand.setSourceStaNo(command.getSourceStaNo());
//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
        crnCommand.setCommand(command.getCommand());
        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
            command.setTaskNo((short) 9999);
        }
@@ -347,13 +366,13 @@
                    command.getCrnNo(),    // 堆垛机[非空]
                    new Date(),    // 下发时间
                    command.getTaskModeType() == null ? null : command.getTaskModeType().toString(),    // 模式
                    command.getSourcePosX().intValue(),    // 源排
                    command.getSourcePosY().intValue(),    // 源列
                    command.getSourcePosZ().intValue(),    // 源层
                    command.getSourcePosZ().intValue(),    // 源排
                    command.getSourcePosX().intValue(),    // 源列
                    command.getSourcePosY().intValue(),    // 源层
                    null,    // 源站
                    command.getDestinationPosX().intValue(),    // 目标排
                    command.getDestinationPosY().intValue(),    // 目标列
                    command.getDestinationPosZ().intValue(),    // 目标层
                    command.getDestinationPosZ().intValue(),    // 目标排
                    command.getDestinationPosX().intValue(),    // 目标列
                    command.getDestinationPosY().intValue(),    // 目标层
                    null,    // 目标站
                    null,    // 响应结果
                    null,    // 修改时间
@@ -363,14 +382,52 @@
        }

        if (result.IsSuccess) {
            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
//            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
//            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
//            return true;
        } else {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.error("写入堆垛机plc数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            return false;
        }


        try{
            //堆垛机任务写入后，回读一次，看是否成功
            Thread.sleep(500);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
            if (resultRead.IsSuccess) {
                CrnCommand one = new CrnCommand();
                one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
                //one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
//                one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
//                one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
                if (!crnCommand.getTaskNo().equals(one.getTaskNo()) && !crnCommand.getAckFinish().equals(one.getAckFinish())
                        && !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) &&  !crnCommand.getSourcePosX().equals(one.getSourcePosX()) && !crnCommand.getSourcePosY().equals(one.getSourcePosY())
                        && !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) &&  !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) && !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
                ){
                    log.error("堆垛机命令地址写入后回读失败[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    log.error("堆垛机命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, crnCommand));
                    Thread.sleep(100);
                    readStatus();
                    return false;
                } else {
                    log.info("堆垛机命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
                }
            }
        }catch (Exception e){
            log.error("堆垛机命令地址写入后回读出错");
        }
        return true;
    }

    /**
@@ -381,6 +438,21 @@
            log.error("堆垛机写入命令为空");
            return false;
        }
        //转换前克隆一份
        CrnCommand crnCommand = new CrnCommand();
        crnCommand.setCrnNo(command.getCrnNo());
        crnCommand.setAckFinish(command.getAckFinish());
        crnCommand.setTaskNo(command.getTaskNo());
        crnCommand.setTaskMode(command.getTaskMode());
        crnCommand.setSourcePosX(command.getSourcePosX());
        crnCommand.setSourcePosY(command.getSourcePosY());
        crnCommand.setSourcePosZ(command.getSourcePosZ());
        crnCommand.setDestinationPosX(command.getDestinationPosX());
        crnCommand.setDestinationPosY(command.getDestinationPosY());
        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
//        crnCommand.setSourceStaNo(command.getSourceStaNo());
//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
        crnCommand.setCommand(command.getCommand());
        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
            command.setTaskNo((short) 9999);
        }
@@ -458,11 +530,9 @@


        if (result.IsSuccess) {
            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
//            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));

            Date now = new Date();

            //更新指令日志
            commandInfoLog.setDeviceLog("指令下发成功");
            commandInfoLogService.insert(commandInfoLog);
@@ -483,7 +553,7 @@
                taskWrkService.updateById(taskWrk);
            }

            return true;

        } else {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.error("写入堆垛机plc数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -493,6 +563,42 @@
            commandInfoLogService.insert(commandInfoLog);
            return false;
        }
        try{
            //堆垛机任务写入后，回读一次，看是否成功
            Thread.sleep(500);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
            if (resultRead.IsSuccess) {
                CrnCommand one = new CrnCommand();
                one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
                //one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
//                one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
//                one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
                if (!crnCommand.getTaskNo().equals(one.getTaskNo()) && !crnCommand.getAckFinish().equals(one.getAckFinish())
                && !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) &&  !crnCommand.getSourcePosX().equals(one.getSourcePosX()) && !crnCommand.getSourcePosY().equals(one.getSourcePosY())
                        && !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) &&  !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) && !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
                ){
                    log.error("堆垛机命令地址写入后回读失败[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    log.error("堆垛机命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, crnCommand));
                    Thread.sleep(100);
                    readStatus();
                    return false;
                } else {
                    log.info("堆垛机命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
                }
            }
        }catch (Exception e){
            log.error("堆垛机命令地址写入后回读出错");
        }
        return true;
    }

    private boolean writeAuto(CrnCommand command){

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

@@ -580,14 +580,6 @@
            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
                staProtocol.setPakMk(true);
            }

            //更新任务步序
            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
            TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
            if (taskWrk != null) {
                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//更新指令步序
                taskWrkService.updateById(taskWrk);
            }
        }

    }

 src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
wcs-slave:
  doubleDeep: false #双深
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24 #双深库位排号
  groupCount: 2 #一个堆垛机负责的货架排数
  doubleDeep: true #双深
  doubleLocs: 1,4,7,10,11,14,15,18,19 #双深库位排号
  groupCount: 4 #一个堆垛机负责的货架排数
  crn[0]: #堆垛机1
    id: 1
    ip: 172.17.91.2

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -106,9 +106,10 @@
        order by io_pri desc,create_time,wrk_no ASC
    </select>

    <select id="selectCrnNoWorking" resultMap="BaseResultMap">
    <select id="selectCrnNoInWorking" resultMap="BaseResultMap">
        select top 1 * from dbo.wcs_task_wrk
        where 1=1
        and io_type != 2
        and (wrk_sts=3 or wrk_sts=12)
        and crn_no=#{crnNo}
        and wrk_no=#{workNo}

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -59,6 +59,8 @@
                        </el-table-column>
                        <el-table-column property="crnNo" label="堆垛机号">
                        </el-table-column>
                        <el-table-column property="barcode" label="条码">
                        </el-table-column>
                    </el-table>

                    <div style="margin-top: 10px;">