Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

lsh

2026-04-21 720e0926fa1c94b952c26e111206c5d6e1ed5ba2

 src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java

@@ -6,16 +6,23 @@
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkLastnoService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatch.StationCommandDispatchResult;
import com.zy.core.dispatch.StationCommandDispatcher;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.StationCommandType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.task.MainProcessLane;
import com.zy.core.task.MainProcessTaskSubmitter;
@@ -26,11 +33,13 @@
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
public class StoreInTaskGenerationService {
    private static final int APPLY_IN_TASK_TIMEOUT_SECONDS = 5;
    private static final int APPLY_FAIL_STATION_BACK_LOCK_SECONDS = 30;

    @Autowired
    private WrkMastService wrkMastService;
@@ -44,6 +53,10 @@
    private CommonService commonService;
    @Autowired
    private MainProcessTaskSubmitter mainProcessTaskSubmitter;
    @Autowired
    private StationCommandDispatcher stationCommandDispatcher;
    @Autowired
    private WrkLastnoService wrkLastnoService;

    /**
     * 保留当前按站点 lane 并发的能力，同时用一个简单计数避免并发生成把站点任务数顶穿上限。
@@ -53,6 +66,11 @@
    public void generate(StoreInTaskPolicy policy, BasDevp basDevp, StationObjModel stationObjModel) {
        try {
            if (!policy.isEnabled()) {
                return;
            }

            StoreInTaskContext earlyContext = buildContext(basDevp, stationObjModel);
            if (earlyContext == null || !handleErrorStationBack(policy, earlyContext)) {
                return;
            }

@@ -102,9 +120,51 @@
            return;
        }

        long count = wrkMastService.count(new QueryWrapper<WrkMast>().eq("barcode", context.getStationProtocol().getBarcode()));
        StationProtocol stationProtocol = context.getStationProtocol();
        if (stationProtocol == null) {
            return;
        }

        if (!stationProtocol.isAutoing()) {
            return;
        }

        if (!stationProtocol.isLoading()) {
            return;
        }

        if (!stationProtocol.isInEnable()) {
            return;
        }

        if (stationProtocol.getTaskNo() == 0) {
            return;
        }

        if (Cools.isEmpty(stationProtocol.getBarcode())) {
            return;
        }

        if (stationProtocol.getError() > 0) {
            return;
        }

        if (stationProtocol.isInBarcodeError()) {
            return;
        }

        if (!stationProtocol.getIoMode().equals(1)) {
            policy.setSystemWarning(context, "当前站点不处于入库模式");
            return;
        }

        String barcode = context.getStationProtocol().getBarcode();
        long count = wrkMastService.count(new QueryWrapper<WrkMast>().eq("barcode", barcode));
        if (count > 0) {
            Object tipsLimit = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_SUCCESS_REPEAT_WARNING_TIPS_LIMIT.key + barcode);
            if (tipsLimit == null) {
            policy.setSystemWarning(context, "系统任务已存在");
            }
            return;
        }

@@ -127,6 +187,86 @@
        } finally {
            releaseGenerateCapacity();
        }
    }

    private boolean handleErrorStationBack(StoreInTaskPolicy policy, StoreInTaskContext context) {
        StationProtocol stationProtocol = context.getStationProtocol();
        if (stationProtocol == null) {
            return false;
        }

        if (!stationProtocol.isAutoing()) {
            return false;
        }

        if (!stationProtocol.isLoading()) {
            return false;
        }

        if (stationProtocol.getError() <= 0) {
            return true;
        }

        if (!stationProtocol.isInBarcodeError()) {
            return true;
        }

        WrkLastno stationBackTaskRange = wrkLastnoService.getById(WrkIoType.STATION_BACK.id);
        Integer currentTaskNo = stationProtocol.getTaskNo();
        if (currentTaskNo != null
                && currentTaskNo > 0
                && stationBackTaskRange != null
                && stationBackTaskRange.getsNo() != null
                && stationBackTaskRange.geteNo() != null
                && currentTaskNo >= stationBackTaskRange.getsNo()
                && currentTaskNo <= stationBackTaskRange.geteNo()) {
            News.info("条码站已处于退回工作号范围，跳过重复生成退回命令。stationId={}，taskNo={}，range=[{}, {}]",
                    stationProtocol.getStationId(),
                    currentTaskNo,
                    stationBackTaskRange.getsNo(),
                    stationBackTaskRange.geteNo());
            return false;
        }

        StationObjModel backStation = context.getStationObjModel().getBackStation();
        if (backStation == null || backStation.getStationId() == null) {
            News.warn("条码站退回失败，退回站未配置。deviceNo={}，stationId={}",
                    context.getBasDevp() == null ? null : context.getBasDevp().getDevpNo(),
                    stationProtocol.getStationId());
            return false;
        }

        if (stationProtocol.getTaskNo() != null
                && stationProtocol.getTaskNo() > 0
                && backStation.getStationId().equals(stationProtocol.getTargetStaNo())) {
            return false;
        }

        Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());
        if (lock != null) {
            return false;
        }

        StationCommand command = context.getStationThread().getCommand(StationCommandType.MOVE,
                commonService.getWorkNo(WrkIoType.STATION_BACK.id),
                context.getStationObjModel().getStationId(),
                backStation.getStationId(), 0);
        if (command == null) {
            News.taskInfo(stationProtocol.getTaskNo(), "{}工作,获取输送线命令失败", stationProtocol.getTaskNo());
            return false;
        }
        stationCommandDispatcher.dispatch(context.getBasDevp().getDevpNo(), command, "store-in-task", "station-back");
        String errorMsg = Cools.isEmpty(stationProtocol.getErrorMsg()) ? "未知异常" : stationProtocol.getErrorMsg();
        String warning = "条码站异常退回，报警信息：" + errorMsg;
        if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
            warning = stationProtocol.getSystemWarning() + ";" + warning;
        }
        policy.setSystemWarning(context, warning);
        News.info("{}扫码站异常，已退回至{},条码站状态：{}", stationProtocol.getTaskNo(),
                backStation.getStationId(), JSON.toJSONString(stationProtocol));
        redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId(),
                "lock", 60 * 60);
        return false;
    }

    private StoreInTaskContext buildContext(BasDevp basDevp, StationObjModel stationObjModel) {
@@ -177,6 +317,7 @@
            WrkMast wrkMast = commonService.createInTask(taskParam);
            policy.afterTaskCreated(context, wrkMast);
            policy.clearSystemWarning(context);
            redisUtil.set(RedisKeyType.GENERATE_IN_TASK_SUCCESS_REPEAT_WARNING_TIPS_LIMIT.key + wrkMast.getBarcode(), "lock", 30);
        } catch (Exception e) {
            News.error("处理WMS入库响应异常，barcode={}，stationId={}", request.getBarcode(),
                    request.getSourceStaNo(), e);
@@ -191,10 +332,98 @@
        result.setResponse(response);
        result.setMessage(message);

        News.error("WMS入库请求失败，barcode={}，stationId={}，response={}",
                request.getBarcode(), request.getSourceStaNo(), policy.buildFailureMessage(result));
        News.error("WMS入库请求失败，barcode={}，stationId={}，response={}，WCS响应={}",
                request.getBarcode(), request.getSourceStaNo(), result.getResponse(), result.getMessage());
        redisUtil.set(policy.getGenerateLockKey(context), "lock", policy.getRetryLockSeconds(context));
        policy.onApplyFailed(context, result);
        triggerStationBackOnApplyFailed(policy, context, request, result);
    }

    /**
     * WMS 申请入库失败后，货物仍停留在扫码站，此时补发退回到入库站的输送命令，避免货物长期滞留。
     */
    private void triggerStationBackOnApplyFailed(StoreInTaskPolicy policy, StoreInTaskContext context,
                                                 InTaskApplyRequest request,
                                                 InTaskApplyResult result) {
        if (context == null || context.getStationThread() == null || context.getStationObjModel() == null) {
            return;
        }

        StationProtocol stationProtocol = context.getStationProtocol();
        if (stationProtocol == null || stationProtocol.getStationId() == null) {
            return;
        }

        StationObjModel backStation = context.getStationObjModel().getBackStation();
        if (backStation == null || backStation.getStationId() == null) {
            News.warn("WMS入库失败后无法退回入库站，退回站未配置。barcode={}，stationId={}",
                    request == null ? null : request.getBarcode(), stationProtocol.getStationId());
            return;
        }

        Integer currentStationId = stationProtocol.getStationId();
        Integer backStationId = backStation.getStationId();
        if (backStationId.equals(currentStationId)) {
            return;
        }

        if (stationProtocol.getTaskNo() != null
                && stationProtocol.getTaskNo() > 0
                && backStationId.equals(stationProtocol.getTargetStaNo())) {
            return;
        }

        String lockKey = RedisKeyType.GENERATE_STATION_BACK_LIMIT.key
                + currentStationId + "_" + stationProtocol.getTaskNo();
        if (redisUtil.get(lockKey) != null) {
            return;
        }

        Integer stationBackTaskNo = commonService.getWorkNo(WrkIoType.STATION_BACK.id);
        StationCommand command = context.getStationThread().getCommand(
                StationCommandType.MOVE,
                stationBackTaskNo,
                currentStationId,
                backStationId,
                0
        );
        if (command == null) {
            News.warn("WMS入库失败后生成退回入库站命令失败。barcode={}，stationId={}，backStationId={}，warning={}",
                    request == null ? null : request.getBarcode(),
                    currentStationId,
                    backStationId,
                    result == null ? null : result.getMessage());
            return;
        }

        StationCommandDispatchResult dispatchResult = stationCommandDispatcher.dispatch(
                context.getBasDevp().getDevpNo(),
                command,
                "store-in-task-generation",
                "apply-failed-station-back"
        );
        if (!dispatchResult.isAccepted()) {
            News.warn("WMS入库失败后退回入库站命令入队失败。barcode={}，stationId={}，backStationId={}，reason={}，warning={}",
                    request == null ? null : request.getBarcode(),
                    currentStationId,
                    backStationId,
                    dispatchResult.getReason(),
                    result == null ? null : result.getMessage());
            return;
        }

        redisUtil.set(lockKey, "lock", APPLY_FAIL_STATION_BACK_LOCK_SECONDS);
        String currentWarning = stationProtocol.getSystemWarning();
        String backWarning = "WMS入库失败，已退回入库站";
        if (!Cools.isEmpty(currentWarning)) {
            backWarning = currentWarning + ";" + backWarning;
        }
        policy.setSystemWarning(context, backWarning);
        News.warn("WMS入库失败，已触发货物退回入库站。barcode={}，stationId={}，backStationId={}，warning={}",
                request == null ? null : request.getBarcode(),
                currentStationId,
                backStationId,
                result == null ? null : result.getMessage());
    }

    private HashMap<String, String> getSystemConfigMap() {