*

lsh

2025-03-30 4e6c566128bc0430d28e204672d54f0efcb4713d

*

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

@@ -36,6 +36,11 @@
    @ApiModelProperty(value= "0:正常，1：禁用")
    private Integer status;


    @ApiModelProperty(value= "")
    @TableField("rgv_some")
    private int rgvSome = 1;

    public BasCircularShuttle() {}

    public BasCircularShuttle(Integer rgvId,Integer rgvNo,Integer status) {

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

@@ -334,6 +334,7 @@
                        rgvCommand.setSourceStaNo1(wrkMast.getSourceStaNo().shortValue());   //工位1起点
                        rgvCommand.setDestinationStaNo1(wrkMast.getStaNo().shortValue());   //工位1目标站点
                        rgvCommand.setCommand((short) 1);   //工位1任务确认
                        rgvCommand.setRgvSome(basCircularShuttle.getRgvSome()==1 ? (short) 1 : (short) 0);
                        if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
                            //
                            log.error("RGV命令下发失败，RGV号={}，任务数据={}", rgvId, JSON.toJSON(rgvCommand));

 src/main/java/com/zy/core/model/command/RgvCommand.java

@@ -52,6 +52,9 @@
    // 工位2任务号
    private Short taskNo2 = 0;


    private Short rgvSome = 1;

    /**
     * 任务模式：
     * 0 = 无

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

@@ -216,9 +216,13 @@
        array[3] = command.getTaskMode1();//任务模式
        array[4] = command.getTaskNo1();



        OperateResult result = siemensNet.Write("DB24.0", array);

        if (command.getAckFinish1().equals((short)0)) {
//            Thread.sleep(100L);
            siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
            Thread.sleep(100L);
            result = siemensNet.Write("DB24.10.0", true);
        } else {

 src/main/resources/mapper/BasCircularShuttleMapper.xml

@@ -8,6 +8,7 @@
        <result column="rgv_id" property="rgvId" />
        <result column="rgv_no" property="rgvNo" />
        <result column="status" property="status" />
        <result column="rgv_some" property="rgvSome" />

    </resultMap>