*

lsh

2025-02-24 dd3e73b101fec95d7277c93d0ab75c266a22e0e4

*

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

@@ -40,10 +40,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.rmi.CORBA.Util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * RGV接口
@@ -475,13 +472,29 @@


    @PostMapping("/disable/rgv/status")
//    @ManagerAuth(memo = "作业信息")
//    @ManagerAuth(memo = "修改RGV状态")
    public R rgvDisableStatus(@RequestParam Integer rgvId,
                              @RequestParam Integer status){
        log.info("/disable/rgv/status===》修改RGV状态！！！rgvId:{},status:{},data:{}",rgvId,status,new Date());
        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
        if (basCircularShuttle == null){
            return R.error().add("未找到此RGV，异常！！！");
        }
        basCircularShuttle.setStatus(status);
        basCircularShuttleService.updateById(basCircularShuttle);
        return R.ok();
    }

    @PostMapping("/disable/task/delete")
//    @ManagerAuth(memo = "删除任务")
    public R taskDisabledelete(@RequestParam Long wrkNo){
        log.info("/disable/task/delete===》删除任务！！！wrkNo:{},data:{}",wrkNo,new Date());
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
        if (Cools.isEmpty(wrkMast)){
            return R.error().add("未找到此任务，异常！！！");
        }
        wrkMastService.deleteById(wrkMast);
        return R.ok();
    }

}

 src/main/webapp/views/index.html

@@ -294,11 +294,18 @@
                            prop="rgvSts"
                            label="RGV状态">
                    </el-table-column>
<!--                    <el-table-column-->
<!--                            prop=""-->
<!--                            label="操作">-->
<!--                        <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
<!--                    </el-table-column>-->
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">
                            <el-button
                                    type="danger"
                                    size="small"
                                    @click="taskDelete(scope.row)">
                                删除
                            </el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        </div>
@@ -451,11 +458,38 @@
                        }
                    }
                },
                taskDelete(row) {
                    let that = this;
                    that.$confirm('确认要删除该设备吗?', '提示', {
                        confirmButtonText: '确定',
                        cancelButtonText: '取消',
                        type: 'warning'
                    }).then(() => {
                        $.ajax({
                            url: baseUrl + "/rgv/disable/task/delete",
                            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;
                    const targetStatus = currentStatus === 0 ? 1 : 0;

                    this.$confirm(`确认要${currentStatus === 0 ? '禁用' : '启用'}该设备吗?`, '提示', {
                    that.$confirm(`确认要${currentStatus === 0 ? '禁用' : '启用'}该设备吗?`, '提示', {
                        confirmButtonText: '确定',
                        cancelButtonText: '取消',
                        type: 'warning'
@@ -470,10 +504,10 @@
                            },
                            success: function (res) {
                                if (res.code === 200) {
                                    this.$message.success(`状态更新成功`);
                                    that.$message.success(`状态更新成功`);
                                    row.status$ = targetStatus; // 更新前端状态
                                } else {
                                    this.$message.error('状态更新失败');
                                    that.$message.error('状态更新失败');
                                }
                            }
                        });