#
zjj
2024-10-22 af6719cb98ccc72200778e0d45437c7682aa056e
#
2个文件已修改
7 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/SiteController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/SiteController.java
@@ -182,7 +182,8 @@
                        staProtocol.setStaNo(staNo);
                    }
                    if (pakMk != null) {
                        staProtocol.setPakMk(pakMk.equals("Y"));
//                        staProtocol.setPakMk(pakMk.equals("Y"));
                        devpThread.setPakMk(staProtocol.getSiteId(), pakMk.equals("Y"));
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
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=jxgtasrs
    url: jdbc:sqlserver://10.0.100.130:1433;databasename=jxgtasrs
    username: sa
    password: sa@123
  mvc:
@@ -34,7 +34,7 @@
  enable: false
wms:
  url: 127.0.0.1:8080/wms
  url: 10.0.100.130:8080/wms
# 下位机配置
wcs-slave: