no message

skyouc

8 天以前 3e7ddfed8f28fda861710fda62cb485e393244c5

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

@@ -117,10 +117,11 @@
            throw new CoolException("主单保存失败！！");
        }
        if (params.getItems().isEmpty()) {
            throw new CoolException("收货通知单明细不能为寒食节！！");
            throw new CoolException("收货通知单明细不能为空！！");
        }
        params.setOrders(orders);

        svaeOrUpdateOrderItem(params,loginUserId);
        svaeOrUpdateOrderItem(params, loginUserId);

        return R.ok("保存成功!!");
    }
@@ -149,29 +150,28 @@
            return R.ok("明细参数不能为空！！");
        }

        svaeOrUpdateOrderItem(params,loginUserId);
        svaeOrUpdateOrderItem(params, loginUserId);

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

    /**
     * @author Ryan
     * @description 更新或保存明细
     * @param
     * @return
     * @author Ryan
     * @description 更新或保存明细
     * @time 2025/4/7 13:28
     */
    @Transactional(rollbackFor = Exception.class)
    private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
    public 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)) {
            if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
                throw new CoolException("明细保存失败！！");
            }
        });
@@ -185,10 +185,10 @@
    }

    /**
     * @author Ryan
     * @description 批量修改
     * @param
     * @return
     * @author Ryan
     * @description 批量修改
     * @time 2025/4/1 07:58
     */
    @Override
@@ -199,11 +199,11 @@
        }
        return this.update(new LambdaUpdateWrapper<AsnOrder>()
                .in(AsnOrder::getId, params.getIds())
                       .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
                        .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
                        .set(!Objects.isNull(order.getStatus()),  AsnOrder::getStatus, order.getStatus())
                        .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
                        .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
                .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
                .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
                .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())
                .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
                .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
                .set(AsnOrder::getUpdateBy, userId));
    }

@@ -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) {
@@ -252,31 +247,40 @@
    }

    /**
     * @author Ryan
     * @description 删除原主单及明细，加入历史档
     * @param
     * @return
     * @author Ryan
     * @description 删除原主单及明细，加入历史档
     * @time 2025/3/19 19:53
     */
    @Transactional(rollbackFor = Exception.class)
    private void operateOrderLogs(AsnOrder asrder) throws Exception{
    public synchronized 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("收货数量不能为零！！");
        asrder.setExceStatus(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("收货数量不能为零！！");
//        }
        AsnOrder order = this.getById(asrder.getId());
        AsnOrderLog orderLog = new AsnOrderLog();
        order.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
//        order.setExceStatus(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 (!this.saveOrUpdate(order)) {
//            throw new CoolException("状态修改失败！！");
//        }
//        orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
        if (!asnOrderLogService.save(orderLog)) {
            throw new CoolException("主单历史档添加失败！！");
        }
@@ -286,6 +290,7 @@
            AsnOrderItemLog itemLog = new AsnOrderItemLog();
            BeanUtils.copyProperties(item, itemLog);
            itemLog.setAsnItemId(itemLog.getId())
                    .setLogId(orderLog.getId())
                    .setAsnId(item.getAsnId());
            logs.add(itemLog);
        });