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
| | |
|---|
| | | if (elem.getAnfme() > orderDetl.getEnableQty()) { |
|---|
| | | throw new CoolException(orderDetl.getMatnr() + "入库数量不合法"); |
|---|
| | | } |
|---|
| | | // 修改订单明细数量 |
|---|
| | | if (!orderDetlService.increase(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) { |
|---|
| | | throw new CoolException("修改单据明细数量失败"); |
|---|
| | | // 修改订单作业数量 |
|---|
| | | if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) { |
|---|
| | | throw new CoolException("修改单据作业数量失败"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); |
|---|
