*

lsh

1 天以前 3951add7a40f76bb403ead8c0acffb970d1bfa5c

*

 src/main/java/com/zy/asrs/entity/BasRgvOpt.java

@@ -5,6 +5,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -149,6 +153,30 @@
    private String memo;

    public BasRgvOpt() {}
    public BasRgvOpt(RgvProtocol rgvProtocol, RgvCommand command) {
        Date now = new Date();
        this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
        this.rgvNo = rgvProtocol.getRgvNo();
        this.sendTime = now;
        this.mode = command.getTaskModeType1().name();
        this.sourceSta = command.getSourceStaNo1().intValue();
        this.posSta = command.getDestinationStaNo1().intValue();
        this.updateTime = now;
        this.updateBy = 9999L;
        this.memo = "任务下发自动生成指令日志";
    }
    public BasRgvOpt(RgvProtocol rgvProtocol, Long command) {
        Date now = new Date();
        this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
        this.rgvNo = rgvProtocol.getRgvNo();
        this.sendTime = now;
        this.mode = "取放货";
        this.sourceSta = rgvProtocol.getRgvPosI();
        this.posSta = command.intValue();
        this.updateTime = now;
        this.updateBy = 9999L;
        this.memo = "漫游任务触发";
    }

    public BasRgvOpt(Integer wrkNo1,Integer wrkNo2,Integer rgvNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) {
        this.wrkNo1 = wrkNo1;

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

@@ -111,7 +111,9 @@
                        break;
                    //工位1写入数据
                    case 2:
                        write((RgvCommand) task.getData());
                        RgvCommand command2 = (RgvCommand) task.getData();
                        rgvOpt(command2);
                        write(command2);
                        break;
                    // 复位
                    case 3:
@@ -125,25 +127,14 @@
                        command.setTaskMode1(RgvTaskModeType.NONE); // 任务模式
                        command.setSourceStaNo1((short)0);     // 源站
                        command.setDestinationStaNo1((short)0);     // 目标站
                        rgvOpt(command);
                        write3(command);
                        break;
                    // 复位
                    case 4:
                        RgvCommand command4 = (RgvCommand) task.getData();
                        if (null == command4) {
                            command4 = new RgvCommand();
                        }
                        command4.setRgvNo(slave.getId()); // RGV编号
                        command4.setTaskNo1((short) 0); // 工作号
                        command4.setAckFinish1((short) 1);  // 任务完成确认位
                        command4.setTaskMode1(RgvTaskModeType.X_MOVE); // 任务模式
                        command4.setSourceStaNo1((short)0);     // 源站
                        command4.setDestinationStaNo1((short)0);     // 目标站
                        write3(command4);
                        break;
                    // 漫游
                    case 5:
                        write5((Long) task.getData());
                        Long aLong = (Long) task.getData();
                        rgvOpt(aLong);
                        write5(aLong);
                        break;
                    default:
                        break;
@@ -307,8 +298,7 @@
                            basRgvErrLogService.insert(basRgvErrLog);
                        }
                    } catch (Exception e){
                        BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);

                        log.error("RGV异常信息保存失败！！");
                    }

                } catch (Exception ignore) {
@@ -331,6 +321,24 @@
    /**
     * 工位1写入数据
     */
    private void rgvOpt(RgvCommand command) {
        try{
            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
            basRgvOptService.insert(basRgvOpt);
        }catch (Exception e){
            log.error("RGV写入命令保存失败！！");
        }
    }
    private void rgvOpt(Long command) {
        try{
            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
            basRgvOptService.insert(basRgvOpt);
        }catch (Exception e){
            log.error("RGV写入命令保存失败！！");
        }
    }
    private boolean write(RgvCommand command) throws InterruptedException {
        if (null == command) {
            log.error("RGV写入命令为空");