# 修改 1. 任务列表修改 2. ASN执行状态修改 3. ASN扩展字段优化 4. 确认收货扩展字段优化

skyouc

2025-04-07 acaf6624ef2f706b8ccf442b453d802320829bd3

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -11,15 +11,22 @@
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.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +53,10 @@
    private PurchaseMapper purchaseMapper;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private AsnOrderLogService asnOrderLogService;
    @Autowired
    private AsnOrderItemLogService asnOrderItemLogService;
    @Resource
    private SerialRuleMapper serialRuleMapper;

@@ -86,7 +97,8 @@
    }

    @Override
    public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
    @Transactional(rollbackFor = Exception.class)
    public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空");
        }
@@ -107,16 +119,9 @@
        if (params.getItems().isEmpty()) {
            throw new CoolException("收货通知单明细不能为寒食节！！");
        }
        params.getItems().forEach(item -> {
            item.put("asnId", orders.getId());
            item.put("asnCode", orders.getCode());
            item.put("poCode", orders.getPoCode());
            item.put("createBy", loginUserId);
            item.put("updateBy", loginUserId);
            if (!asnOrderItemService.fieldsSave(item)) {
                throw new CoolException("明细保存失败！！");
            }
        });

        svaeOrUpdateOrderItem(params,loginUserId);

        return R.ok("保存成功!!");
    }

@@ -128,26 +133,55 @@
     * @return
     */
    @Override
    @Transactional
    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
    @Transactional(rollbackFor = Exception.class)
    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
        AsnOrder orders = params.getOrders();
        if (Objects.isNull(orders)) {
            throw new CoolException("主单信息不能为空！！");
        }
        if (Objects.isNull(params.getOrders().getId())) {
        if (Objects.isNull(orders.getId())) {
            throw new CoolException("数据错误：单据ID不能为空！！");
        }
        if (!this.updateById(params.getOrders())) {
        if (!this.updateById(orders)) {
            throw new CoolException("主单修改失败！！");
        }
        if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
            return R.ok("修改完成！！");
            return R.ok("明细参数不能为空！！");
        }
        List<Map<String, Object>> items = params.getItems();
        List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
        if (!asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
            throw new CoolException("明细修改失败！！");
        }

        svaeOrUpdateOrderItem(params,loginUserId);

        return R.ok("修改完成！！");
    }

    /**
     * @author Ryan
     * @description 更新或保存明细
     * @param
     * @return
     * @time 2025/4/7 13:28
     */
    @Transactional(rollbackFor = Exception.class)
    private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
        AsnOrder orders = params.getOrders();

        params.getItems().forEach(item -> {
            item.put("asnId", orders.getId());
            item.put("asnCode", orders.getCode());
            item.put("poCode", orders.getPoCode());
            item.put("createBy", loginUserId);
            item.put("updateBy", loginUserId);
            if (!asnOrderItemService.fieldsSave(item)) {
                throw new CoolException("明细保存失败！！");
            }
        });
        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
        double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
        orders.setAnfme(sum);
        if (!this.updateById(orders)) {
            throw new CoolException("计划收货数量修改失败！！");
        }
    }

    /**
@@ -171,6 +205,79 @@
                        .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
                        .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
                .set(AsnOrder::getUpdateBy, userId));
    }

    /**
     * @param id
     * @param loginUserId
     * @return
     * @author Ryan
     * @description 一键收货
     * @time 2025/4/3 15:45
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R completeOrder(Long id, Long loginUserId) {
        AsnOrder asnOrder = this.getById(id);
        if (Objects.isNull(asnOrder)) {
            throw new CoolException("单据不存在!!");
        }
        //一键加入历史档
        try {
            operateOrderLogs(asnOrder);
        } catch (Exception e) {
            throw new CoolException("收货完成失败！！");
        }
        return R.ok("收货成功！！");
    }

    /**
     * @author Ryan
     * @description 删除原主单及明细，加入历史档
     * @param
     * @return
     * @time 2025/3/19 19:53
     */
    @Transactional(rollbackFor = Exception.class)
    private void operateOrderLogs(AsnOrder asrder) throws Exception{
        if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
            throw new CoolException("参数不能为空！！");
        }
        if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
            throw new CoolException("收货数量不能为零！！");
        }
        AsnOrder order = this.getById(asrder.getId());
        AsnOrderLog orderLog = new AsnOrderLog();
        order.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
        BeanUtils.copyProperties(order, orderLog);
        orderLog.setId(null);
        orderLog.setAsnId(order.getId());

        if (!this.saveOrUpdate(order)) {
            throw new CoolException("状态修改失败！！");
        }
        orderLog.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
        if (!asnOrderLogService.save(orderLog)) {
            throw new CoolException("主单历史档添加失败！！");
        }
        List<AsnOrderItemLog> logs = new ArrayList<>();
        List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
        items.forEach(item -> {
            AsnOrderItemLog itemLog = new AsnOrderItemLog();
            BeanUtils.copyProperties(item, itemLog);
            itemLog.setAsnItemId(itemLog.getId())
                    .setAsnId(item.getAsnId());
            logs.add(itemLog);
        });

        if (!asnOrderItemLogService.saveBatch(logs)) {
            throw new CoolException("通知单明细历史档保存失败！！");
        }
        if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
            throw new CoolException("原单据明细删除失败！！");
        }
        if (!this.removeById(asrder.getId())) {
            throw new CoolException("原单据删除失败！！");
        }
    }
}