#车锁

zjj

2024-03-01 a4ec8a6945091ad596e59092b66df441496092c0

#车锁

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

@@ -35,6 +35,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -384,6 +385,14 @@
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
        rgvThread.setPakMk(true);
        return R.ok();
    }

//    @ManagerAuth(memo = "暂停")
//    @PostMapping("/operator/pause")
//    public R crnPause(CrnOperatorParam param){

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

@@ -86,6 +86,7 @@
            vo.setRgvPos(rgvProtocol.getRgvPos());
            vo.setRgvPos1(rgvProtocol.getRgvPosI());
            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"不在定位":"在定位");
            vo.setPakMk(rgvThread.isPakMk()?"Y":"N");
//            vo.setWorkNo2(rgvProtocol.getTaskNo2());  //  工位2任务号
//            vo.setStatus2(rgvProtocol.getStatusType2().desc);  // 工位2状态
//            vo.setLoading2(rgvProtocol.getLoaded2()==1?"有物":"无物");  // 工位2有物

 src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java

@@ -48,4 +48,6 @@
    private String alarm = "-";
    private Integer RgvPos1 = 0;

    private String pakMk="-";

}

 src/main/webapp/views/rgv.html

@@ -102,6 +102,7 @@
<!--                        <th>有物2</th>-->
                        <th>故障代码</th>
                        <th>故障描述</th>
                        <th>锁定状态</th>
                    </tr>
                    </thead>
                    <tbody>
@@ -214,10 +215,11 @@
                        <!--                <button class="item" onclick="reverseOrigin()">反原点</button>-->
                        <!--                <button class="item" onclick="coorMove()">坐标移行</button>-->
                        <button class="item" onclick="taskComplete()">任务完成</button>
                        <button class="item" onclick="lock()">解锁</button>
                        <!--                <button class="item" onclick="pause()">暂停</button>-->
                        <!--                <button class="item" onclick="boot()">启动</button>-->
<!--                        <button class="item" onclick="clearCommand()">清除命令</button>-->
                        <button class="item" onclick="handleReset()">复位</button>
<!--                        <button class="item" onclick="handleReset()">复位</button>-->
                    </div>
                </fieldset>
            </div>
@@ -323,6 +325,7 @@
                        // setVal(tr.children("td").eq(10), table[i-1].loading2);
                        setVal(tr.children("td").eq(8), table[i-1].warnCode);
                        setVal(tr.children("td").eq(9), table[i-1].alarm);
                        setVal(tr.children("td").eq(10), table[i-1].pakMk);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -454,6 +457,12 @@
        });
    }

    function lock() {
        http.post(baseUrl+"/rgv/lock", getReqParam(), function (res) {
            layer.msg(res.msg);
        });
    }

    // 暂停
    function pause() {
        http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {