#

mrzhssss

2023-01-14 a2b7db5cb3d1ee6f4322601d8a3c734bd1bc5990

#

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

@@ -362,6 +362,20 @@
    @ManagerAuth(memo = "任务完成")
    @PostMapping("/operator/taskComplete")
    public R crnTaskComplete(CrnOperatorParam param){
        // 获取堆垛机信息
        CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
        if (crnThread == null) {
            return R.error();
        }
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) {
            return R.error();
        }

        //堆垛机状态不是等待WCS确认时，不能下发确认位
        if (!crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.WAITING)){
            return R.error("堆垛机不是等待WCS确认状态");
        }
        CrnCommand command = new CrnCommand();
        command.setCrnNo(param.getCrnNo()); // 堆垛机编号
        command.setTaskNo((short) 0); // 工作号

 src/main/webapp/views/crn.html

@@ -210,8 +210,8 @@
                        <button class="item" onclick="taskComplete()">任务完成</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="clearCommand()">清除命令</button>-->
<!--                        <button class="item" onclick="handleReset()">复位</button>-->
                    </div>
                </fieldset>
            </div>