多加入参数和修改规则

cl

6 天以前 2a34b52125d5fc356d65ee1e8912845dd601d4e3

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

@@ -24,6 +24,7 @@
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.schedules.ScheduleJobs;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -123,6 +124,10 @@
    private TaskService taskService;
    @Autowired
    private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
    @Autowired
    private ScheduleJobs scheduleJobs;
    @Autowired
    private OutStockService outStockService;

    /**
     * 云仓改单/取消前：任务明细已关联该单据且主任务未逻辑删除则不允许
@@ -602,6 +607,19 @@
                .setUpdateTime(new Date())
                .setCreateBy(loginUserId)
                .setUpdateBy(loginUserId);
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            wkOrder.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            wkOrder.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        String effTypeForDoc = resolvedOrderType != null ? resolvedOrderType : StringUtils.trimToNull(syncOrder.getType());
        if (OrderType.ORDER_IN.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            wkOrder.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            wkOrder.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }

        if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) {
            wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
@@ -630,7 +648,64 @@
        if (!asnOrderService.updateById(wkOrder)) {
            throw new CoolException("计划收货数量修改失败！！");
        }
        directReceiptInboundAfterCloudSync(wkOrder, loginUserId);
        return "Success";
    }

    /**
     * DirectWaitPakin 开启时，云仓新增入库通知单成功后立即写入收货区，并将完成数量与计划数对齐（与 {@link ScheduleJobs#IgnoreReceipt} 一致，避免仅依赖定时任务延迟）。
     */
    private void directReceiptInboundAfterCloudSync(WkOrder wkOrder, Long loginUserId) {
        if (!isDirectWaitPakin() || wkOrder == null || wkOrder.getId() == null) {
            return;
        }
        if (!OrderType.ORDER_IN.type.equals(wkOrder.getType())) {
            return;
        }
        if (OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type.equals(wkOrder.getWkType())) {
            WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
                    .eq(WkOrder::getPoId, wkOrder.getPoId())
                    .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
            if (one == null || !Objects.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val, one.getExceStatus())) {
                return;
            }
        }
        WarehouseAreas receiptArea = warehouseAreasService.getOne(
                new LambdaQueryWrapper<WarehouseAreas>()
                        .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
        if (receiptArea == null) {
            log.warn("directReceiptInboundAfterCloudSync: 未配置收货区，跳过 orderId={}", wkOrder.getId());
            return;
        }
        List<WkOrderItem> orderItems = asnOrderItemService.list(
                new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
        if (orderItems.isEmpty()) {
            return;
        }
        for (WkOrderItem item : orderItems) {
            Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
            if (matnr == null) {
                throw new CoolException("物料不存在：" + item.getMatnrCode());
            }
            try {
                scheduleJobs.updateReceipt(receiptArea, item, wkOrder, matnr);
            } catch (Exception e) {
                throw new CoolException(e.getMessage());
            }
            if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                    .set(WkOrderItem::getQty, item.getAnfme())
                    .eq(WkOrderItem::getId, item.getId()))) {
                throw new CoolException("收货单明细完成数量修改失败！！");
            }
        }
        if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                .set(WkOrder::getQty, wkOrder.getAnfme())
                .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
                .set(WkOrder::getUpdateBy, loginUserId)
                .set(WkOrder::getUpdateTime, new Date())
                .eq(WkOrder::getId, wkOrder.getId()))) {
            throw new CoolException("收货单状态修改失败！！");
        }
    }

    /** 与 updateOrderNoPakin / mergeOrderWithPakin 写入规则一致；无有效变更时返回 null */
@@ -716,6 +791,26 @@
        }
        if (StringUtils.isNotBlank(syncOrder.getStationId())) {
            if (!StringUtils.equals(StringUtils.trimToNull(syncOrder.getStationId()), StringUtils.trimToNull(order.getStationId()))) {
                return true;
            }
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            if (!StringUtils.equals(syncOrder.getOrgNo().trim(), StringUtils.trimToNull(order.getDocOrgNo()))) {
                return true;
            }
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getDocTaskWarehouseNo().trim(), StringUtils.trimToNull(order.getDocTaskWarehouseNo()))) {
                return true;
            }
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getInWarehouseNo().trim(), StringUtils.trimToNull(order.getDocInWarehouseNo()))) {
                return true;
            }
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            if (!StringUtils.equals(syncOrder.getOutWarehouseNo().trim(), StringUtils.trimToNull(order.getDocOutWarehouseNo()))) {
                return true;
            }
        }
@@ -825,6 +920,18 @@
        if (StringUtils.isNotBlank(syncOrder.getStationId())) {
            order.setStationId(syncOrder.getStationId());
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            order.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }
        order.setUpdateBy(loginUserId);
        order.setUpdateTime(new Date());
        asnOrderService.updateById(order);
@@ -910,6 +1017,18 @@
        if (StringUtils.isNotBlank(syncOrder.getStationId())) {
            order.setStationId(syncOrder.getStationId());
        }
        if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
            order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
        }
        if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
            order.setDocOrgNo(syncOrder.getOrgNo().trim());
        }
        if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
            order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
        }
        if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
            order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
        }
        order.setUpdateBy(loginUserId);
        order.setUpdateTime(new Date());
        asnOrderService.updateById(order);