#

luxiaotao1123

2020-09-01 9cfdcce0c696caa562a2c0a0ee0f24c43459517b

#

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

@@ -49,7 +49,7 @@
                vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
                vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
                vo.setInreq1(staProtocol.isInreq1()?"Y":"N");       // 需求1
                vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
                vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                vo.setStaNo(staProtocol.getStaNo());                // 目标站

@@ -126,7 +126,7 @@
                    vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                    vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
                    vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
                    vo.setInreq1(staProtocol.isInreq1()?"Y":"N");       // 需求1
                    vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    return R.ok().add(vo);

 src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java

@@ -27,7 +27,7 @@
    private String outEnable;

    // 需求1
    private String inreq1;
    private String pakMk;

    // 空板信号
    private String emptyMk;

 src/main/webapp/views/pipeline.html

@@ -62,7 +62,7 @@
                    <th>有物</th>
                    <th>可入</th>
                    <th>可出</th>
                    <th>需求1</th>
                    <th>入库标记</th>
                    <th>空板信号</th>
                    <th>目标站</th>
                </tr>
@@ -175,7 +175,7 @@
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].inEnable);
                        setVal(tr.children("td").eq(5), table[i-1].outEnable);
                        setVal(tr.children("td").eq(6), table[i-1].inreq1);
                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                    }