verou
2025-04-08 fe88c3671515ab5ed0e66100fd1bf22102ffdc0c
Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
3个文件已修改
34 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -200,8 +200,14 @@
        return asnOrderService.completeOrder(id, getLoginUserId());
    }
    @ApiOperation("关闭收货单")
    @PostMapping("/asnOrder/close/{id}")
    @PreAuthorize("hasAuthority('manager:asnOrder:update')")
    public R closeOrder(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            return R.error("参数不能为空!!");
        }
        return asnOrderService.closeOrder(id);
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -22,4 +22,6 @@
    boolean batchUpdate(BatchUpdateParam params, Long loginUserId);
    R completeOrder(Long id, Long loginUserId);
    R closeOrder(Long id);
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -231,6 +231,26 @@
        return R.ok("收货成功!!");
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R closeOrder(Long id) {
        AsnOrder order = this.getById(id);
        if (Objects.isNull(order)) {
            throw new CoolException("单据不存在!!");
        }
        order.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
        if (!this.updateById(order)) {
            throw new CoolException("单据关闭失败!!");
        }
        try {
            operateOrderLogs(order);
        } catch (Exception e) {
            throw new CoolException("单据关闭失败!!");
        }
        return null;
    }
    /**
     * @author Ryan
     * @description 删除原主单及明细,加入历史档