#

Junjie

2026-01-21 bd9d305718423039775503510694df088ea8b41b

#

 src/main/java/com/zy/core/model/protocol/StationProtocol.java

@@ -1,5 +1,8 @@
package com.zy.core.model.protocol;

import com.core.common.SpringUtils;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import lombok.Data;

import java.util.Map;
@@ -58,6 +61,9 @@
    //重量
    private Double weight;

    //WCS系统报警
    private String systemWarning;

   /**
    * 扩展数据
    */
@@ -73,4 +79,17 @@
        return null;
    }

    public String getSuperTaskNo() {
        if(taskNo == null){
            return "0";
        }

        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
        WrkMast wrkMast = wrkMastService.selectByWorkNo(taskNo);
        if(wrkMast == null){
            return "0";
        }
        return String.valueOf(wrkMast.getWmsWrkNo());
    }

}

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

@@ -493,6 +493,8 @@
                                wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
                                        stationProtocol.getPalletHeight());
                                redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);

                                stationProtocol.setSystemWarning("请求入库失败，WMS返回=" + response);
                                continue;
                            }

@@ -515,6 +517,8 @@
                                    continue;
                                }
                                MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));

                                stationProtocol.setSystemWarning("");
                            } else {
                                // 接口返回非200，重新发起请求
                                News.error("WMS入库接口返回非200，重新发起请求，barcode={}，stationId={}，response={}", barcode,
@@ -522,6 +526,8 @@
                                wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
                                        stationProtocol.getPalletHeight());
                                redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);

                                stationProtocol.setSystemWarning("请求入库失败，WMS返回=" + response);
                            }
                        } else {
                            // 3. 没有响应结果，检查是否有请求正在进行中
@@ -531,6 +537,8 @@
                                wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
                                        stationProtocol.getPalletHeight());
                                redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);

                                stationProtocol.setSystemWarning("请求入库失败，WMS无返回");
                            }
                        }
                    }

 src/main/java/com/zy/core/thread/impl/ZyStationThread.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.utils.Utils;
@@ -142,6 +143,14 @@
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setWeight(statusEntity.getWeight());
                }

                if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
                    if (stationProtocol.isAutoing()
                            && !stationProtocol.isLoading()
                    ) {
                        stationProtocol.setSystemWarning("");
                    }
                }
            }
        }


 src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -147,6 +148,14 @@
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setWeight(statusEntity.getWeight());
                }

                if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
                    if (stationProtocol.isAutoing()
                            && !stationProtocol.isLoading()
                    ) {
                        stationProtocol.setSystemWarning("");
                    }
                }
            }
        }