license.lic

Binary files differ

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -97,7 +97,7 @@
        }
        int num = 20;
        try {
            Config config = configService.selectConfigByCode("AutoLocMove");
            Config config = configService.selectConfigByCode("CheckOrderNum");
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {

            } else {

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -28,7 +28,11 @@
     **/
    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        return dto.getLocType1().equals(loc.getLocType1());
        boolean flag = dto.getLocType1().equals(loc.getLocType1());
        if (flag) {
            flag = dto.getLocType2().equals(loc.getLocType2());
        }
        return flag;
    }

}

 src/main/java/com/zy/common/service/CommonService.java

@@ -254,9 +254,10 @@
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
                for (LocMast locMast1 : locMasts) {
                    //获取巷道
//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
//                    LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                        continue;
                    }

                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {

 src/main/java/com/zy/common/web/WcsController.java

@@ -87,6 +87,15 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
            locTypeDto.setLocType2((short) 1);
        }else if (param.getBarcode().startsWith("13")) {
            locTypeDto.setLocType2((short) 2);
        }else if (param.getBarcode().startsWith("16")) {
            locTypeDto.setLocType2((short) 3);
        }else {
            return R.error("未知托盘码规则");
        }

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -179,6 +188,9 @@
//        dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));

        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档

 src/main/resources/application.yml

@@ -28,9 +28,9 @@
      maxRequestSize: 100MB
other:
  datasource:
    jdbc-url: jdbc:mysql://192.168.5.61:3306/wmsdata
    username: liku
    password: 123456
    jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
    username: root
    password: root
    driver-class-name: com.mysql.cj.jdbc.Driver


@@ -57,13 +57,13 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,9,13
  doubleLocsLeft: 4,7,11,15,19,23
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
  doubleLocsRight: 3,7,10,14,18,22,26
# wms参数配置
wms-parameter:
  # 自动补空板功能开关

 src/main/resources/license.lic

Binary files differ