#

whycq

2022-08-12 566471670b790929468a86ed9788b33255013fa0

#

 pom.xml

@@ -15,7 +15,7 @@

    <properties>
        <java.version>1.8</java.version>
        <cool.version>2.0.0</cool.version>
        <cool.version>3.2.0</cool.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
        <mybatis-plus.version>2.3.2</mybatis-plus.version>
        <fastjson.version>1.2.58</fastjson.version>

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

@@ -1244,7 +1244,8 @@
                }

//                // 入出库模式判断
                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
//                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }

                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()

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

@@ -231,7 +231,7 @@
            return;
        }
        int index = staNos.indexOf(staProtocol.getSiteId());
        short[] array = new short[10];
        short[] array = new short[2];
        array[0] = staProtocol.getWorkNo();
        array[1] = staProtocol.getStaNo();
        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
    username: sa
    password: sa@123
  mvc: