skyouc
3 天以前 b5ef11d9dd995dd37beb83f53e55ca672e051f9b
单据删除操作
3个文件已修改
58 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -168,7 +168,6 @@
        if (Objects.isNull(orders)) {
            return R.error("参数不能为空!!");
        }
        return receiveMsgService.syncOrderUpdate(orders);
    }
@@ -182,9 +181,11 @@
    @ApiOperation("单据删除")
    @OperationLog("单据删除")
    @PostMapping("/sync/orders/delete")
    public R syncOrderDel(@RequestBody List<OrderParams> orders) {
        return R.ok();
    public R syncOrderDel(@RequestBody List<SyncOrderParams> orders) {
        if (Objects.isNull(orders)) {
            return R.error("参数不能为空!!");
        }
        return receiveMsgService.syncOrderDelete(orders);
    }
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
@@ -121,4 +121,12 @@
     * @version 1.0
     */
    R syncOrderUpdate(SyncOrderParams orders);
    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 单据删除
     * @version 1.0
     */
    R syncOrderDelete(List<SyncOrderParams> orders);
}
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -13,10 +13,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderSourceType;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.manager.service.impl.TransferItemServiceImpl;
@@ -546,6 +543,7 @@
        if (orders.getType().equals(OrderType.ORDER_IN.type)) {
            orders.getItems().forEach(orderItem -> {
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                        .eq(WkOrder::getCode, orderItem.getOrderCode()));
                if (Objects.isNull(order)) {
                    throw new CoolException("单据不存在!!");
@@ -571,7 +569,6 @@
                if (!asnOrderService.updateById(order)) {
                    throw new CoolException("单据修改失败!!");
                }
                //TODO 添加操作日志
            });
        } else {
@@ -579,4 +576,38 @@
        return null;
    }
    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 删除单据
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncOrderDelete(List<SyncOrderParams> orders) {
        orders.forEach(order -> {
            order.getItems().forEach(orderItem -> {
                WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, order.getType())
                        .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))
                        .eq(WkOrder::getId, orderItem.getOrderId()));
                if (Objects.isNull(wkOrder)) {
                    throw new CoolException("订单:" + orderItem.getOrderCode() + ",当前状态,不可执行删除操作!!");
                }
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
                    throw new CoolException("单据明细删除失败!!");
                }
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
                if (orderItems.isEmpty()) {
                    if (!asnOrderService.removeById(orderItem.getOrderId())) {
                        throw new CoolException("单据删除失败!!");
                    }
                }
            });
        });
        return R.ok();
    }
}