lsh#

1

2 天以前 14b93c6637a0d84cb0195934910236291d65abcb

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

@@ -1,14 +1,13 @@
package com.vincent.rsf.server.api.service.impl;


import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
@@ -17,31 +16,34 @@
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
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.WarehouseAreasItemServiceImpl;
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.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

/**
@@ -67,6 +69,8 @@
    private MatnrServiceImpl matnrService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderLogService asnOrderLogService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
@@ -99,6 +103,10 @@
    private DictDataService dictDataService;
    @Autowired
    private DictTypeService dictTypeService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WarehouseAreasItemServiceImpl warehouseAreasItemService;


    /**
@@ -225,11 +233,20 @@
    @Override
    public R queryOrderStatus(QueryOrderParam queryParams) {
        WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getCode, queryParams.getOrderNo())
                .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
                .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
        if (Objects.isNull(wkOrders)) {
            throw new CoolException("单据不存在！！");
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "-1");
            return R.ok("单据不存在 ！！").add(map);
        }

        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
        if (!Objects.isNull(orderLog)) {
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "4");
            return R.ok("单据已完成 ！！").add(map);
        }

        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));

        WkOrderDto wkorderDto = new WkOrderDto();
@@ -277,7 +294,7 @@
    /**
     * @author Ryan
     * @date 2025/8/18
     * @description: 物料信息同步
     * @description: 物料分组信息同步
     * @version 1.0
     */
    @Override
@@ -394,13 +411,13 @@
    public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
        if (!syncOrders.isEmpty()) {
            syncOrders.forEach(syncOrder -> {
                WkOrder wkOrder = new WkOrder();
                WkOrder wkOrder = new WkOrder(syncOrder);
                DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
                        .eq(DictData::getLabel, syncOrder.getWkType()), false);
                        .eq(DictData::getValue, syncOrder.getWkType()), false);
                if (Objects.isNull(one)) {
                    throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
                }
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                 WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
                        .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
                if (!Objects.isNull(order)) {
@@ -419,12 +436,21 @@
                    rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
                }

                String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
                //银座特供
                String orderNs = null;
                if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE) ){
                    StringBuffer buffer = new StringBuffer();
                    Object poCode = syncOrder.getOrderNo();
                    orderNs = poCode == null ? "" : buffer.append(poCode).toString();
                }
                String ruleCode = orderNs;
                wkOrder.setType(syncOrder.getType())
                        .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
                        .setWkType(one.getValue())
                        .setAnfme(syncOrder.getAnfme())
                        .setPoCode(syncOrder.getOrderNo())
                        .setPoId(syncOrder.getOrderId())
                        .setWorkQty(0.0)
                        .setQty(0.0)
                        .setPoId(syncOrder.getOrderInternalCode())
                        .setCode(ruleCode)
                        .setArrTime(syncOrder.getArrTime())
                        .setId(null)
@@ -432,16 +458,36 @@
                        .setUpdateTime(new Date())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId);

                if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
                    wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
                }
                if (!asnOrderService.save(wkOrder)) {
                    throw new CoolException("单据保存失败！！");
                }

                syncOrder.getOrdersItems().forEach(orderItem -> {
                AtomicReference<String> palletId = new AtomicReference<>();
                syncOrder.getOrderItems().forEach(orderItem -> {
                    if (Cools.isEmpty(palletId.get())){
                        palletId.set(orderItem.getPalletId());
                    } else {
                        if (!palletId.get().equals(orderItem.getPalletId())){
                            throw new CoolException("同一个单据明细中的托盘码必须一致！！！");
                        }
                    }
                    Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
                    map.put("orderId", wkOrder.getId());
                    map.put("poId", wkOrder.getPoId());
                    map.put("poCode", wkOrder.getPoCode());
                    map.put("order_code", wkOrder.getCode());
                    map.put("matnrCode", orderItem.getMatnr());
                    map.put("platWorkCode", orderItem.getPlanNo());
                    map.put("platItemId", orderItem.getLineId());
                    map.put("splrBatch", orderItem.getBatch());
                    map.put("batch", orderItem.getBatch());
                    map.put("spec", orderItem.getSpecs());
                    map.put("model", orderItem.getModel());
                    map.put("stockUnit", orderItem.getUnit());
                    map.put("purUnit", orderItem.getUnit());

                    if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                        throw new CoolException("明细保存失败！！");
@@ -454,11 +500,63 @@
                if (!asnOrderService.updateById(wkOrder)) {
                    throw new CoolException("计划收货数量修改失败！！");
                }

                // 立即触发异步任务，不等待结果
                if (!Cools.isEmpty(palletId.get()) && StringUtils.isNotBlank(syncOrder.getOrderNo()) && !Cools.isEmpty(syncOrder.getStationId())) {
                    //组托
                    WaitPakinParam pakinParam = new WaitPakinParam();
                    pakinParam.setBarcode(palletId.get());
                    pakinParam.setStaNo(syncOrder.getStationId());

                    boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
                    if (itemsCheck) {
                        CompletableFuture.runAsync(() -> {
                            try {
                                asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
                            } catch (Exception e) {
                                log.warn("订单 {} 开始自动组托", syncOrder.getOrderNo());
                            }
                        });
                    }
                }
            });
        }

        return R.ok();
    }

    @Async
    public void asyncMergeItemsWcs(WaitPakinParam param, String orderNo, Long loginUserId) {
        try {
            int i = 0;
            while (true) {
                i++;
                if (i>5) return;
                Thread.sleep(3000);
                List<WarehouseAreasItem> list = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
                        .eq(WarehouseAreasItem::getAsnCode, orderNo));

                if (list.isEmpty()) {
                    log.warn("订单 {} 没有找到库区项目，跳过组托", orderNo);
                    continue;
                }
                List<PakinItem> itemList = list.stream().map(item -> {
                    PakinItem pakinItem = new PakinItem();
                    pakinItem.setAsnCode(item.getAsnCode());
                    pakinItem.setId(item.getId());
                    pakinItem.setMatnrId(item.getMatnrId());
                    pakinItem.setReceiptQty(item.getAnfme());
                    return pakinItem;
                }).collect(Collectors.toList());
                param.setItems(itemList);
                break;
            }
            waitPakinService.mergeItemsWcs(param, loginUserId);
            log.info("订单 {} 自动组托完成，共处理 {} 个项目", orderNo, param.getItems().size());
        } catch (Exception e) {
            log.error("订单 {} 自动组托失败: {}", orderNo, e.getMessage(), e);
        }
    }
    /**
     * @author Ryan
     * @date 2025/8/19
@@ -576,7 +674,7 @@
            revise.getItems().forEach(reviseItem -> {
                ReviseLogItem logItem = new ReviseLogItem();
                BeanUtils.copyProperties(reviseItem, logItem);
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnrCode()));
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnr()));
                if (Objects.isNull(matnr)) {
                    throw new CoolException("物料不存在！！");
                }
@@ -619,15 +717,15 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("请确认单据：" + order.getOrderNo() + "是否已经执行或是否同步！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(WkOrderItem::getOrderCode, wkOrder.getCode()));
                if (!Objects.isNull(wkOrderItem)) {
                    if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                            .eq(WkOrderItem::getOrderCode, wkOrder.getCode())
                            .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                            .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                            .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
                            .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
                            .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
@@ -669,9 +767,9 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("订单：" + wkOrder.getCode() + "，当前状态，不可执行删除操作！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
                        .eq(WkOrderItem::getOrderCode, wkOrder.getCode()))) {
@@ -744,4 +842,52 @@

        return R.ok().add(dtos);
    }

    /**
     * 基础物料信息变更
     * @param baseMatParms
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R matUpdate(BaseMatParms baseMatParms) {
        if (StringUtils.isBlank(baseMatParms.getMatnr())) {
            throw new CoolException("物料编码不能为空！！");
        }
        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
        if (Objects.isNull(matnr)) {
            Matnr matnr1 = new Matnr();
            BeanUtils.copyProperties(baseMatParms, matnr1);
            matnr1.setCode(baseMatParms.getMatnr());
            matnr1.setName(baseMatParms.getMaktx());
            if (!Objects.isNull(baseMatParms.getGroupName())) {
                MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
                        .eq(MatnrGroup::getName, baseMatParms.getGroupName()));
                if (!Objects.isNull(matnrGroup)) {
                    matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
                }
            }
            if (!matnrService.save(matnr1)) {
                throw new CoolException("物料新增失败！！");
            }
        } else {
            if (!Objects.isNull(baseMatParms.getGroupName())) {
                MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
                        .eq(MatnrGroup::getName, baseMatParms.getGroupName()));
                if (!Objects.isNull(matnrGroup)) {
                    matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
                }
            }
            matnr.setName(baseMatParms.getMaktx())
                    .setColor(baseMatParms.getColor())
                    .setModel(baseMatParms.getModel())
                    .setSpec(baseMatParms.getSpec());

            if (!matnrService.updateById(matnr)) {
                throw new CoolException("物料更新失败！！");
            }
        }

        return R.ok();
    }
}