#

Administrator

2026-04-25 d300a0ef052579d73d27daa9cd1acf35fa00ed0a

#

 src/main/java/com/zy/core/plugin/XiaosongProcess.java

@@ -15,10 +15,7 @@
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
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.enums.*;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
@@ -35,6 +32,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -177,6 +175,13 @@
                                .selectList(new EntityWrapper<WrkMast>()
                                        .eq("barcode", stationProtocol.getBarcode()));
                        if (!wrkMasts.isEmpty()) {
                            for (WrkMast wrkMast : wrkMasts) {
                                if (wrkMast.getIoType().equals(WrkIoType.OUT.id) && wrkMast.getWrkSts().equals(WrkStsType.STATION_RUN.sts)) {
                                    wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
                                    wrkMast.setModiTime(new Date());
                                    wrkMastService.updateById(wrkMast);
                                }
                            }
                            continue;
                        }


 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -455,7 +455,10 @@
                && stationProtocol.getTaskNo() > 0
        ) {
            //检测任务是否生成
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .eq("barcode", stationProtocol.getBarcode())
                    .eq("io_type", WrkIoType.IN.id)
            );
            if (wrkMast == null) {
                return false;
            }