#
whycq
2024-05-02 8d1150c5be8ba6d4ec7e04de3a95e86a748b9cf5
#
2个文件已修改
9 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -194,6 +194,11 @@
                    }
                    //判断101和104是否是拣料、并板、盘点再入库   设备暂不支持101、104站盘点/拣料入库
                    WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                    if(!Cools.isEmpty(wrkMast1)){
                        if (wrkMast1.getIoType()!=1){
                            continue;
                        }
                    }
                    if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                        log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                        continue;
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://127.0.0.1:1433;databasename=phpsasrs
    url: jdbc:sqlserver://10.10.10.235:1433;databasename=phpsasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
    username: sa
    password: sa@123
@@ -73,7 +73,7 @@
    crnInStn[2]:
      devpPlcId: ${wcs-slave.devp[2].id}
      staNo: 310
      row: 3
      row: 2
      bay: 1
      lev: 3
    # 堆垛机出库站点1