1

zhang

2025-08-02 2ecc68828a413ef4d26b858daeca3e18008ab66b

1

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -39,7 +39,6 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -94,7 +93,7 @@
    private String wmsUrl;
    public short wrkNo = 9999;
    @Autowired
    private ConfigServiceImpl configService;
    private BasCrnOptService crnOptService;

    /**
     * 组托
@@ -2298,11 +2297,16 @@
                if (crnProtocol.getBay() == 1 && crnProtocol.getLevel() == 1) {
                    continue;
                }

                BasCrnOpt crnNo = crnOptService.selectOne(new EntityWrapper<BasCrnOpt>().eq("crn_no", crn.getId()).orderBy("send_time", false));
                if (crnNo != null) {
                    if (System.currentTimeMillis() - crnNo.getSendTime().getTime() < 1000 * 60 * 3) {
                        continue;
                    }
                } else {
                if (System.currentTimeMillis() - crnProtocol.getLastCommandTime() < 1000 * 60 * 2) {
                    continue;
                }

                }
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                        .eq("crn_no", crn.getId())
                        .notIn("wrk_sts", 5, 14, 15)

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

@@ -187,6 +187,11 @@
     */
    public Float yDuration;

    /**
     * 上一次指令下发时间
     */
    private Long lastCommandTime = System.currentTimeMillis();

    public void setMode(Short mode) {
        this.mode = mode;
        this.modeType = CrnModeType.get(mode);