#

Junjie

2023-10-04 d9271883338de97164a36ea9a1e5fc7eef73e64d

#

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

@@ -103,6 +103,7 @@
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setLocType1(staProtocol.getLocType1().toString());                // 高低信号
        }
        return R.ok().add(list);
    }

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

@@ -41,4 +41,7 @@
    //四向穿梭车可取信号
    private String shuttleTakeEnable = "-";

    //高低信号
    private String locType1 = "-";

}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -225,7 +225,7 @@
                        param.setBarcode(barcode);
                        param.setIoType(1);
                        param.setSourceStaNo(inSta.getStaNo());
//                        param.setLocType1(locTypeDto.getLocType1());
                        param.setLocType1(locTypeDto.getLocType1());
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/loc/v1")

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -1,5 +1,6 @@
package com.zy.common.model;

import com.core.exception.CoolException;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;

@@ -22,14 +23,10 @@
    }

    public LocTypeDto(StaProtocol staProtocol) {
//        if (staProtocol.isHigh() == staProtocol.isLow()) {
//            throw new CoolException("plc高低检测异常");
//        }
//        if (staProtocol.isLow()) {
//            this.locType1 = 1; // 低库位
//        } else {
//            this.locType1 = 2; // 高库位
//        }
        if (staProtocol.getLocType1() == null || staProtocol.getLocType1() == 0) {
            throw new CoolException("plc高低检测异常");
        }
        this.locType1 = staProtocol.getLocType1();
    }

    /**

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -87,6 +87,9 @@
    //输送线102站回退信号
    private Integer rollback102;

    //高低信号 0:无 1:低 2:中 3:高
    private Short locType1;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);

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

@@ -57,9 +57,13 @@
        add(333);add(339);
    }};

    public static final ArrayList<Integer> outInStaNos = new ArrayList<Integer>() {{
        add(102);add(105);add(106);
        add(107);add(108);
    //高低信号站点
    public static final ArrayList<Integer> locType1StaNos = new ArrayList<Integer>() {{
        add(100);add(103);
        add(105);add(200);
        add(203);add(205);
        add(300);add(341);
        add(346);
    }};

    public boolean charge0;
@@ -184,6 +188,17 @@
            }
        }

        //读高低信号
        Thread.sleep(100);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB1000.300", (short) (locType1StaNos.size()*2));
        if (result3.IsSuccess) {
            for (int i = 0; i < locType1StaNos.size(); i++) {
                Integer siteId = locType1StaNos.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result3.Content, i * 2));//读取高低信号
            }
        }

        // 外形检测 - 102
        Thread.sleep(50);
        OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB100.100", (short)2);

 src/main/webapp/views/pipeline.html

@@ -103,7 +103,7 @@
                        <th>空板信号</th>
                        <th>目标站</th>
                        <th>提升机到位信号</th>
                        <th>预留</th>
                        <th>高低信号</th>
                    </tr>
                    </thead>
                    <!-- 表格内容 -->
@@ -290,7 +290,7 @@
                        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].liftArrival);
                        setVal(tr.children("td").eq(10), table[i-1].shuttleTakeEnable);
                        setVal(tr.children("td").eq(10), table[i-1].locType1);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";