Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
# Conflicts:
# src/main/java/com/zy/asrs/controller/MatCodeController.java
# src/main/java/com/zy/asrs/utils/VersionUtils.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
# src/main/resources/application.yml
| | |
|---|
| | | assert ioType != null; |
|---|
| | | // 获取库位 |
|---|
| | | LocMast locMast = locMastService.selectById(dto.getLocNo()); |
|---|
| | | |
|---|
| | | Integer outSta = staNo.getDevNo(); |
|---|
| | | //2号堆垛机全板出库站指定为204站，拣料站指定为202 |
|---|
| | | if(locMast.getCrnNo()==2){ |
|---|
| | | outSta = ioType == 101 ? 204 : 202; |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 获取路径 |
|---|
| | | StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo()); |
|---|
| | | StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta); |
|---|
| | | // 生成工作号 |
|---|
| | | int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType)); |
|---|
| | | // 生成工作档 |
|---|
