#

zjj

2024-01-17 9fd5af5f6156a3697c9530a4086d180a49fa0dd8

#

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

@@ -88,6 +88,8 @@
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "小" : "大");     //高低库位
            vo.setLocType1(devp.getLocType1$());
            vo.setAutoIn(staProtocol.isEmptyInPalletRequire()?"Y":"N");
            vo.setAutoIn(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
//            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
        return R.ok().add(list);

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

@@ -37,4 +37,7 @@

    //高低库位
    private String locType1 = "-";

    private String autoIn = "-";
    private String autoOut = "-";
}

 src/main/webapp/views/pipeline.html

@@ -91,6 +91,8 @@
                        <th>空板信号</th>
                        <th>目标站</th>
                        <th>高低库位</th>
                        <th>自动出</th>
                        <th>自动入</th>
                    </tr>
                    </thead>
                    <!-- 表格内容 -->
@@ -279,6 +281,8 @@
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                        setVal(tr.children("td").eq(9), table[i-1].locType1);
                        setVal(tr.children("td").eq(10), table[i-1].autoIn);
                        setVal(tr.children("td").eq(10), table[i-1].autoOut);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";