Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

LSH

2023-08-29 22094a20a803866201e0b2dd7ff7c266871ffe52

Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

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

@@ -849,7 +849,7 @@
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                    //测试库位出库必须要按启动按钮才能出库
                    if(wrkMast.getStaNo()==206 && locMast.getCtnKind()==0){
                    if((wrkMast.getStaNo()==206 || wrkMast.getStaNo()==1000)&& locMast.getCtnKind()==0){
                        log.error("出库 ===>> 等待启动出库按钮",wrkMast);
                        continue;
                    }

 src/main/resources/application.yml

@@ -9,7 +9,6 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs

    username: sa
    password: sa@123
  mvc:
@@ -69,6 +68,13 @@
      row: 2
      bay: 0
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1000
      row: 1
      bay: 25
      lev: 1
  # 堆垛机2
  crn[1]:
    id: 2
@@ -124,6 +130,9 @@
    # 出库口3
    outSta[2]:
      staNo: 205
    # 出库口4
    outSta[3]:
      staNo: 1000
  # 条码扫描仪1
  barcode[0]:
    id: 1