#SuperLoaded

lsh

2024-04-12 23dad6ec6a8496feab15c2c95e8f9b6593c05ef7

#SuperLoaded

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

@@ -4396,8 +4396,8 @@
//        List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
        //更新当前小车锁
        try{
//            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(staEnd, staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
//            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(staEnd, staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
            Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //获取合并干涉项
            basRgvMapCurrent.setLockEndRoute(fallMerge);
            basRgvMapMapper.updateById(basRgvMapCurrent);

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

@@ -78,6 +78,9 @@
    // 扫码失败
    private boolean barcodeErr;

    // Super有无信息
    private boolean loadingSuper = true;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);
@@ -85,8 +88,7 @@
        basDevp.setAutoing(autoing?"Y":"N");
        basDevp.setLoading(loading?"Y":"N");
        basDevp.setEmptyMk(emptyMk?"Y":"N");
        if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && (basDevp.getWrkNo()==0 || !basDevp.getWrkNo().equals(basDevp.getWrkNo1()))){
            basDevp.setWrkNo1(workNo);
        if (autoing && !loadingSuper && !loading){
            basDevp.setReportSign(0);
        }
        basDevp.setInEnable(inEnable?"Y":"N");

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

@@ -68,6 +68,15 @@
        add(220);add(221);add(222);add(2000);
    }};

    public static final ArrayList<Integer> staNos1Super = new ArrayList<Integer>() {{
        add(118);add(119);add(120);add(121);add(131);add(135);add(147);
    }};

    public static final ArrayList<Integer> staNos2Super = new ArrayList<Integer>() {{
        add(213);
    }};


    /**
     * 条码数量
     */
@@ -96,6 +105,17 @@
                return staNos1;
            case 2:
                return staNos2;
            default:
                throw new CoolException("服务器异常");
        }
    }

    private ArrayList<Integer> getStaNoSuper() {
        switch (slave.getId()) {
            case 1:
                return staNos1Super;
            case 2:
                return staNos2Super;
            default:
                throw new CoolException("服务器异常");
        }
@@ -179,7 +199,9 @@
//        // 更新入出库模式
//        updateIoMode();
        ArrayList<Integer> staNos = getStaNo();
        ArrayList<Integer> staNoSuper = getStaNoSuper();
        int staNoSize = staNos.size();
        int staNoSuperSize = staNoSuper.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
@@ -295,6 +317,22 @@
            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
        }

        //站点超级有物信号
        Thread.sleep(200);
        OperateResultExOne<byte[]> resultStaSuper = siemensS7Net.Read("DB101.1320",(short)(staNoSuperSize*2));
        if (resultStaSuper.IsSuccess) {
            for (int i = 0; i < staNoSuperSize; i++) {
                Integer siteId = staNoSuper.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                short loadingSuper = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 2);
                staProtocol.setLoadingSuper(loadingSuper==0);   // 目标站
            }
        }


        if (result.IsSuccess) {

 src/main/resources/application.yml

@@ -8,7 +8,16 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs
#    url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
    username: sa
    password: sa@123
  mvc: