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
| | |
|---|
| | | private BasDevpService basDevpService; |
|---|
| | | @Autowired |
|---|
| | | private PackService packService; |
|---|
| | | @Autowired |
|---|
| | | private WorkService workService; |
|---|
| | | |
|---|
| | | // 组托 ---------------------------------------------------------------------------------------------------- |
|---|
| | | |
|---|
| | |
|---|
| | | //根据订单号生成出库任务工作档,待实现 |
|---|
| | | List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo)); |
|---|
| | | for(OrderDetl orderDetl : orderDetls){ |
|---|
| | | |
|---|
| | | //查询所有库位状态为F的库位信息 |
|---|
| | | List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),null); |
|---|
| | | if (locDetls.size() == 0) { |
|---|
| | | throw new CoolException("库存中没有该物料"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
