#

luxiaotao1123

2021-01-02 a7b455d1982e0b4df3913e70461fe91c6eea1c8f

#

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>jswcs</finalName>
        <finalName>htwcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -74,17 +74,7 @@
        // 初始化堆垛机线程
        log.info("初始化堆垛机线程...................................................");
        for (CrnSlave crn : slaveProperties.getCrn()) {
            CrnThread crnThread = null;
            switch (crn.getId()) {
                case 1:
                    crnThread = new SiemensCrnThread(crn);
                    break;
                case 2:
                    crnThread = new MelsecCrnThread(crn);
                    break;
                default:
                    break;
            }
            CrnThread crnThread = new SiemensCrnThread(crn);
            new Thread((Runnable) crnThread).start();
            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
        }
@@ -92,17 +82,7 @@
        // 初始化输送线线程
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = null;
            switch (devp.getId()) {
                case 1:
                    devpThread = new SiemensDevpThread(devp);
                    break;
                case 2:
                    devpThread = new MelsecDevpThread(devp);
                    break;
                default:
                    break;
            }
            DevpThread devpThread = new SiemensDevpThread(devp);
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }
@@ -120,13 +100,6 @@
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
        }
        // 初始化台车线程
        log.info("初始化台车线程...................................................");
        for (Slave car : slaveProperties.getCar()) {
            CarThread carThread = new CarThread(car);
            new Thread(carThread).start();
            SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
        }
    }


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

File was deleted

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

File was deleted

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

File was deleted

 src/main/resources/application.yml

@@ -7,11 +7,7 @@
  application:
    name: @pom.build.finalName@
  datasource:
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
    #username: sa
    #password: eisoft
    url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
    username: sa
    password: sa@123
@@ -105,26 +101,6 @@
    # 拣料入库口
    pickSta[0]:
      staNo: 3
  # 输送线
  devp[1]:
    id: 2
    ip: 192.168.6.21
    port: 6000
    rack: 0
    slot: 1
    # 入库口1
    inSta[0]:
      staNo: 105
      barcode: ${wcs-slave.barcode[1].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 104
    # 出库口1
    outSta[0]:
      staNo: 104
    # 拣料入库口
    pickSta[0]:
      staNo: 105
  # 条码扫描仪
  barcode[0]:
    id: 1

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/jswcs";
var baseUrl = "/htwcs";

// 赋值
function setVal(el, val) {