skyouc
2025-04-10 e78b9a8617ec78c9ccd0fc4dc635f494644e33a2
导出模板修改
4个文件已修改
39 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -121,7 +122,13 @@
    @PostMapping("/asnOrder/export")
    @ApiOperation("导出")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response);
        List<AsnOrder> orders = new ArrayList<>();
        if (!Objects.isNull(map.get("ids"))) {
            orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")).eq(AsnOrder::getStatus, 1));
        } else {
            orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().last("limit 1"));
        }
        ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
    }
    /**
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -118,10 +118,17 @@
    @PostMapping("/asnOrderItem/export")
    @ApiOperation("导出收货通知单明细")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
        List<AsnOrderTemplate> list = new ArrayList<>();
        list.add(template);
        ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
//        AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
//        List<AsnOrderTemplate> list = new ArrayList<>();
//        list.add(template);
        List<AsnOrderItem> orderItems = new ArrayList<>();
        if (!Objects.isNull(map.get("ids"))) {
            orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")).eq(AsnOrderItem::getStatus, 1));
        } else {
            orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().last("limit 1"));
        }
        ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
    }
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -238,11 +238,6 @@
        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) {
@@ -263,6 +258,15 @@
        if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
            throw new CoolException("参数不能为空!!");
        }
        asrder.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
        if (!this.updateById(asrder)) {
            throw new CoolException("单据关闭失败!!");
        }
        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
        if (orderItems.isEmpty()) {
            throw new CoolException("收货明细为空!!");
        }
        if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
            throw new CoolException("收货数量不能为零!!");
        }
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -18,6 +18,7 @@
            stock_unit,
            pur_qty,
            pur_unit,
            prod_time,
            qty,
            splr_code,
            splr_batch,