#

yxFwq

2024-11-24 152b73f374348909a0dc4748c4937978314c5820

#

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

@@ -154,6 +154,7 @@
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
        for (BasJar basJar : jars) {
            if (basJar.getJarCode()>2) continue;
            // 表格行
            JarStateTableVo vo = new JarStateTableVo();
            vo.setJarNo(basJar.getJarNo());   //  RGV号

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

@@ -41,6 +41,7 @@
            return R.error("未查询到信息");
        }
        ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
        int idSign = 0;
        for (BasJarMast jarMast : jarMasts) {
            JarMastTableVo jarMastTableVo = new JarMastTableVo();
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
@@ -52,6 +53,8 @@
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                return R.error("未查询到任务数据");
            }

            jarMastTableVo.setId(++idSign);
            jarMastTableVo.setJarId(jarMast.getJarId());
            jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
            jarMastTableVo.setStatus(jarMast.getStatus());

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

@@ -41,6 +41,7 @@
            return R.error("未查询到信息");
        }
        ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
        int idSign = 0;
        for (BasJarMastLog jarMast : jarMasts) {
            JarMastTableVo jarMastTableVo = new JarMastTableVo();
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
@@ -69,6 +70,7 @@
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                return R.error("未查询到任务数据");
            }
            jarMastTableVo.setId(++idSign);
            jarMastTableVo.setJarId(jarMast.getJarId());
            jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
            jarMastTableVo.setStatus(jarMast.getStatus());

 src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java

@@ -4,6 +4,7 @@

@Data
public class JarMastTableVo {
    private Integer id;
    private Integer jarId;
    private String jarWrkNo;
    private Integer status;

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

@@ -79,7 +79,7 @@
    <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
        <div style="width: 100%;">
            <el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
                max-height="420" style="width: 100%">
                max-height="350" style="width: 100%">
                <el-table-column property="jarNo" label="硫化罐">
                </el-table-column>
<!--                <el-table-column property="workNo" label="工作号">-->
@@ -106,7 +106,7 @@
                                @cancel="cancelEvent"
                        >
                            <template #reference>
                                <el-button>修改</el-button>
                                <el-button>修改最大储量</el-button>
                            </template>
                        </el-popconfirm>
                    </template>
@@ -146,8 +146,8 @@
                        <el-empty description="请选择设备"></el-empty>
                    </div>
                    <div v-else>
                        <el-table border :data="item" highlight-current-row max-height="350" style="width: 100%">
                            <el-table-column property="jarId" label="硫化罐">
                        <el-table border :data="itemMast" highlight-current-row max-height="400" style="width: 100%">
                            <el-table-column property="id" label="序号">
                            </el-table-column>
                            <el-table-column property="jarWrkNo" label="工作号">
                            </el-table-column>
@@ -294,7 +294,7 @@
                ],
                demo: 'X',
                rgvMode: 0,
                item: []
                itemMast: []
            },
            created() {
                this.init()
@@ -322,8 +322,8 @@
                                id: that.tableData[that.currentIndex].jarNo
                            },
                            success: function (res) {
                                that.item = res.data
                                console.log(that.item)
                                that.itemMast = res.data
                                // console.log(that.itemMast)
                            }
                        });
                    }
@@ -438,8 +438,8 @@
                            id: row.jarNo
                        },
                        success: function (res) {
                            that.item = res.data
                            console.log(that.item)
                            that.itemMast = res.data
                            // console.log(that.itemMast)
                        }
                    });
                },