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
| | |
|---|
| | | return R.ok("盘点成功"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/out/pakout/auth") |
|---|
| | | @PostMapping("/order/out/pakout/auth") |
|---|
| | | // @ManagerAuth(memo = "根据订单出库") |
|---|
| | | public synchronized R pakoutByOrder(@RequestBody JSONObject param) { |
|---|
| | | if(!param.containsKey("staNo") || !param.containsKey("orderNo")){ |
|---|
