#

whycq

2023-02-14 7afae7415d0fa7cdd65b751deb0377c89a8f9981

#

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

@@ -126,8 +126,8 @@
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "短" : "长");     //高低库位
//            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
        return R.ok().add(list);
    }

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

@@ -162,23 +162,23 @@
                }
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 工作号

                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));   // 目标站
//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));   // 目标站
            }
        }
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
//        if (result0.IsSuccess) {
//            for (int i = 0; i < 93; i++) {
//                Integer siteId = staNos.get(i); // 站点编号
//                StaProtocol staProtocol = station.get(siteId);
//                if (null == staProtocol) {
//                    staProtocol = new StaProtocol();
//                    staProtocol.setSiteId(siteId);
//                    station.put(siteId, staProtocol);
//                }
//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 目标站
//            }
//        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
        if (result0.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 目标站
            }
        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = null;
        result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize * 2));

 src/main/webapp/static/js/console.map.js

@@ -91,8 +91,8 @@
    "rackDescs": [
        {
            "type": "rackDescs",
            "id": "lb_desc1",
            "text": "#1",
            "id": "lb_desc8",
            "text": "#8",
            "top": 150,
            "left": 1345,
            "width": 30,
@@ -100,18 +100,9 @@
        },
        {
            "type": "rackDescs",
            "id": "lb_desc3",
            "text": "#3",
            "id": "lb_desc6",
            "text": "#6",
            "top": 223,
            "left": 1380,
            "width": 30,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc4",
            "text": "#4",
            "top": 245,
            "left": 1380,
            "width": 30,
            "height": 23
@@ -120,6 +111,15 @@
            "type": "rackDescs",
            "id": "lb_desc5",
            "text": "#5",
            "top": 245,
            "left": 1380,
            "width": 30,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc4",
            "text": "#4",
            "top": 280,
            "left": 1380,
            "width": 30,
@@ -127,8 +127,8 @@
        },
        {
            "type": "rackDescs",
            "id": "lb_desc6",
            "text": "#6",
            "id": "lb_desc3",
            "text": "#3",
            "top": 300,
            "left": 1380,
            "width": 30,
@@ -136,8 +136,8 @@
        },
        {
            "type": "rackDescs",
            "id": "lb_desc8",
            "text": "#8",
            "id": "lb_desc1",
            "text": "#1",
            "top": 380,
            "left": 1345,
            "width": 30,

 src/main/webapp/views/pipeline.html

@@ -115,7 +115,7 @@
                        <th>入库标记</th>
                        <th>空板信号</th>
                        <th>目标站</th>
                        <th>高低库位</th>
                        <th>长短库位</th>
                    </tr>
                    </thead>
                    <!-- 表格内容 -->