单据同步功能优化 单据修改接口优化

skyouc

8 小时以前 b7d3b5954bc0f811c85b0c4efb9c2095ddef9a99

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -19,12 +19,19 @@
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.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.entity.DictType;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.DictTypeService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -84,6 +91,10 @@
    private CheckDiffService checkDiffService;
    @Autowired
    private CheckDiffItemService checkDiffItemService;
    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private DictTypeService dictTypeService;


    /**
@@ -368,58 +379,49 @@
        return R.ok();
    }


    /**
     * @author Ryan
     * @date 2025/8/26
     * @description: 单据同步
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) {
        List<SyncOrdersItem> ordersItems = syncOrders.getItems();
        Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode));
        listMap.keySet().forEach(orderCode -> {
            WkOrder wkOrder = new WkOrder();
            String ruleCode = null;
            if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null);
            }

            SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get();
            Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum();
            wkOrder.setType(syncOrders.getType())
                    .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType()))
                    .setAnfme(anfmes)
                    .setPoCode(orderCode)
                    .setPoId(ordersItem.getId())
                    .setCode(ruleCode)
                    .setId(null)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);

            if (!asnOrderService.save(wkOrder)) {
                throw new CoolException("单据保存失败！！");
            }

            listMap.get(orderCode).forEach(order -> {
                WkOrderItem wkOrderItem = new WkOrderItem();
                BeanUtils.copyProperties(order, wkOrderItem);
                wkOrderItem.setOrderCode(wkOrder.getCode())
                        .setOrderId(wkOrder.getId())
                        .setId(null);

                if (!asnOrderItemService.save(wkOrderItem)) {
                    throw new CoolException("单据明细保存失败！！");
    public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
        if (!syncOrders.isEmpty()) {
            syncOrders.forEach(syncOrder -> {
                WkOrder wkOrder = new WkOrder();
                DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
                        .eq(DictData::getLabel, syncOrder.getWkType()), false);
                if (Objects.isNull(one)) {
                    throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
                }
                wkOrder.setType(OrderWorkType.getOrderType(syncOrder.getWkType()))
                        .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
                        .setAnfme(syncOrder.getAnfme())
                        .setCode(syncOrder.getOrderNo())
                        .setArrTime(syncOrder.getArrTime())
                        .setId(null)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId);
                if (!asnOrderService.save(wkOrder)) {
                    throw new CoolException("单据保存失败！！");
                }
                List<SyncOrdersItem> ordersItems = syncOrder.getOrdersItems();
                ordersItems.forEach(item -> {
                    WkOrderItem wkOrderItem = new WkOrderItem();
                    BeanUtils.copyProperties(item, wkOrderItem);
                    wkOrderItem.setOrderCode(wkOrder.getCode())
                            .setOrderId(wkOrder.getId())
                            .setId(null);
                    if (!asnOrderItemService.save(wkOrderItem)) {
                        throw new CoolException("单据明细保存失败！！");
                    }
                });
            });
        });

        }
        return R.ok();
    }

@@ -573,41 +575,31 @@
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncOrderUpdate(SyncOrderParams orders) {
        //入库单修改
        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("单据不存在！！");
                }

    public R syncOrderUpdate(List<SyncOrderParams> orders) {
        orders.forEach(order -> {
            List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
                    AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
            WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                    .in(WkOrder::getExceStatus, list)
                    .eq(WkOrder::getCode, order.getOrderNo()));
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("请确认单据：" + order.getOrderNo() + "是否已经执行或是否同步！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
                if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode())
                        .eq(WkOrderItem::getOrderCode, order.getOrderNo())
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
                        .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
                    throw new CoolException("单据修改失败！！");
                }

                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, order.getId()));
                if (orderItems.isEmpty()) {
                    throw new CoolException("单据明细不存在！！");
                }

                Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                order.setAnfme(summed);

                if (!asnOrderService.updateById(order)) {
                    throw new CoolException("单据修改失败！！");
                }
            });
        } else {

        }
            wkOrder.setAnfme(order.getAnfme());
            if (!asnOrderService.updateById(wkOrder)) {
                throw new CoolException("主单据修改失败！！");
            }
        });
        return null;
    }

@@ -621,25 +613,34 @@
    @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() + "，当前状态，不可执行删除操作！！");
                }
            List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
                    AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
            WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                    .in(WkOrder::getExceStatus, list)
                    .eq(WkOrder::getCode, order.getOrderNo()));
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("订单：" + wkOrder.getCode() + "，当前状态，不可执行删除操作！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
                        .eq(WkOrderItem::getOrderCode, wkOrder.getCode()))) {
                    throw new CoolException("单据明细删除失败！！");
                }
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
                if (orderItems.isEmpty()) {
                    if (!asnOrderService.removeById(orderItem.getOrderId())) {
                    if (!asnOrderService.removeById(wkOrder.getId())) {
                        throw new CoolException("单据删除失败！！");
                    }
                } else {
                    Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                            .eq(WkOrder::getId, wkOrder.getId())
                            .set(WkOrder::getAnfme, sum))) {
                        throw new CoolException("主单数量修改失败！！");
                    }
                }
            });
        });