#

zjj

2023-12-17 f1b1ba2ea0373b9b74884b57f5cc5d6408f12345

#

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

@@ -729,6 +729,22 @@
        return crnControl2(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "复位")
    @PostMapping("/crn/operator/reset")
    public R crnReset(CrnOperatorParam param){
        // 系统运行状态判断
        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
            return R.error("wcs系统状态为开启");
        }
        short[] array = new short[9];
        CrnCommand command = new CrnCommand();
        command.setCrnNo(param.getCrnNo()); // 堆垛机编号
        command.setTaskNo((short) 0); // 工作号
        command.setReset((short)1);

        return crnControl2(command)?R.ok():R.error();
    }



    private boolean crnControl2(CrnCommand command){

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

@@ -82,6 +82,7 @@
    private Short onlineWrk3 = 0;
    //恢复联机任务
    private Short onlineWrk4 = 0;
    private  Short reset = 0;

    // 任务确认 0：未确认 1：已确认
    private Short command = 0;

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

@@ -196,7 +196,7 @@
                if (resetFlag) {
                    CrnCommand crnCommand = new CrnCommand();
                    crnCommand.setAckFinish((short)1);
                    if (write2(crnCommand)) {
                    if (write(crnCommand)) {
                        resetFlag = false;

                        //堆垛机任务完成后访问wms请求任务完成 locationDone 货位处理完成
@@ -515,6 +515,9 @@
        }else if (command.getOnlineWrk4() != 0){
            array[0] = command.getOnlineWrk4();
            result = siemensNet.Write("DB103.8", array);
        } else if (command.getReset() != 0) {
            array[0] = command.getReset();
            result = siemensNet.Write("DB103.10", array);
        }



 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -79,7 +79,7 @@
                            <el-button @click="requestOperate('siteMove')" type="primary">站到站</el-button>
                            <el-button @click="requestOperate('taskComplete')" type="primary">任务完成</el-button>
                            <el-button @click="requestOperate('clearCommand')" type="primary">清除命令</el-button>
<!--                            <el-button @click="requestOperate('handleReset')" type="primary">复位</el-button>-->
                            <el-button @click="requestOperate('reset')" type="primary">复位</el-button>
                            <br/>
                            <br/>
                            <el-button @click="requestOperate('auto')" type="warning">联机</el-button>