*

lsh

2025-10-24 209626ba2b4797f7d1c003a2876026ffcd39928a

*

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

@@ -574,4 +574,23 @@
        return R.ok();
    }

    @PostMapping("/disable/task/delete1")
//    @ManagerAuth(memo = "初始化任务")
    public R taskDisabledelete1(@RequestParam Long wrkNo){
        Date now = new Date();
        log.info("/disable/task/delete1===》初始化任务！！！wrkNo:{},data:{}",wrkNo,new Date());
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
        if (Cools.isEmpty(wrkMast)){
            return R.error().add("未找到此任务，异常！！！");
        }
        wrkMast.setWrkSts(1L);
        wrkMast.setRgvNo(0);
        wrkMast.setAppeTime(now);
        wrkMast.setLogErrTime(now);
        if (wrkMastService.updateById(wrkMast)){
            return R.ok();
        }
        return R.error("初始化失败！！！");
    }

}

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

@@ -636,10 +636,9 @@

                    Date now = new Date();
                    wrkMast.setWrkSts(1L);
                    wrkMast.setRgvNo(null);
                    wrkMast.setRgvNo(0);
                    wrkMast.setAppeTime(now);
                    wrkMast.setLogErrTime(now);
                    wrkMast.setRgvNo(null);

                    wrkMast.setLogErrMemo("RGV申请取消任务，RGV号={"+rgvProtocol.getRgvNo()+"}，取消时间："+now);


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

@@ -5,11 +5,14 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCircularShuttle;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasCircularShuttleService;
import com.zy.asrs.service.BasRgvErrLogService;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
@@ -63,14 +66,6 @@
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        connectRgv = this.connect();
        while(!connectRgv){
            try {
                connectRgv = this.connect();
                Thread.sleep(100);
            } catch (Exception e){

            }
        }

        // 启动线程自动重连
        new Thread(this::rgvConnect).start();
@@ -159,6 +154,16 @@
                Thread.sleep(1000);
                if(!connectRgv){
                    try {
                        // 根据实时信息更新数据库
                        BasCircularShuttleService basCircularShuttleService = SpringUtils.getBean(BasCircularShuttleService.class);
                        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no",  slave.getId()));
                        if (basCircularShuttle.getStatus() != 0){
                            continue;
                        }
                    } catch (Exception ignore) {

                    }
                    try {
                        connectRgv = this.connect();
                        Thread.sleep(100);
                    } catch (Exception e){

 src/main/webapp/views/index.html

@@ -152,6 +152,18 @@
                            </el-button>
                        </template>
                    </el-table-column>
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">
                            <el-button
                                    type="danger"
                                    size="small"
                                    @click="taskDelete1(scope.row)">
                                初始化
                            </el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        </div>
@@ -505,6 +517,32 @@
                        });
                    });
                },
                taskDelete1(row) {
                    let that = this;
                    that.$confirm('确认要初始化该任务吗?', '提示', {
                        confirmButtonText: '确定',
                        cancelButtonText: '取消',
                        type: 'warning'
                    }).then(() => {
                        $.ajax({
                            url: baseUrl + "/rgv/disable/task/delete1",
                            headers: {'token': localStorage.getItem('token')},
                            method: 'POST',
                            data: {
                                wrkNo: row.wrkNo
                            },
                            success: function (res) {
                                if (res.code === 200) {
                                    that.$message.success('初始化成功');
                                    // 删除当前行
                                    // that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
                                } else {
                                    that.$message.error('初始化失败');
                                }
                            }
                        });
                    });
                },
                toggleStatus(index, row) {
                    let that = this;
                    const currentStatus = row.status;