chen.lin
1 天以前 b003a49794f49a329e2702918ecfc8d14b371d0d
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -69,6 +69,8 @@
    private AsnOrderService asnOrderService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private WaitPakinItemService waitPakinItemService;
    @Override
    public boolean notifyInspect(List<WkOrder> orders) {
@@ -379,6 +381,12 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R removeOrders(List<Long> ids) {
        // 已组托不可删除,需先解除组托
        long palletizedCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
                .in(WaitPakinItem::getAsnId, ids));
        if (palletizedCount > 0) {
            throw new CoolException("单据已组托,请先解除组托后再删除!!");
        }
        for (Long id : ids) {
            List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                    .eq(WkOrderItem::getOrderId, id));
@@ -510,30 +518,38 @@
//            throw new CoolException("收货数量不能为零!!");
//        }
        WkOrder order = this.getById(asrder.getId());
        AsnOrderLog orderLog = new AsnOrderLog();
//        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(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
        if (!asnOrderLogService.save(orderLog)) {
            throw new CoolException("主单历史档添加失败!!");
        AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
        AsnOrderLog orderLog;
        if (Objects.isNull(one)) {
            orderLog = new AsnOrderLog();
            BeanUtils.copyProperties(order, orderLog);
            orderLog.setId(null);
            orderLog.setAsnId(order.getId());
            if (!asnOrderLogService.save(orderLog)) {
                throw new CoolException("主单历史档添加失败!!");
            }
        } else {
            long existingLogId = one.getId();
            BeanUtils.copyProperties(order, one);
            one.setId(existingLogId);
            one.setAsnId(order.getId());
            if (!asnOrderLogService.updateById(one)) {
                throw new CoolException("主单历史档更新失败!!");
            }
            orderLog = one;
            asnOrderItemLogService.remove(new LambdaQueryWrapper<AsnOrderItemLog>().eq(AsnOrderItemLog::getLogId, existingLogId));
        }
        List<AsnOrderItemLog> logs = new ArrayList<>();
        List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
        items.forEach(item -> {
            AsnOrderItemLog itemLog = new AsnOrderItemLog();
            BeanUtils.copyProperties(item, itemLog);
            itemLog.setAsnItemId(itemLog.getId())
            itemLog.setAsnItemId(item.getId())
                    .setId(null)
                    .setLogId(orderLog.getId())
                    .setAsnId(item.getOrderId());
            logs.add(itemLog);
        });
        if (!asnOrderItemLogService.saveBatch(logs)) {
            throw new CoolException("通知单明细历史档保存失败!!");
        }