#

lsh

2025-06-11 b4e0f827567f8d5ad4a1ff5caa22675cbc165b88

#

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

@@ -3200,6 +3200,7 @@
                    staProtocolnew.setWorkNo(wrkMast.getWrkNo());
                    staProtocolnew.setStaNo(144);
                    devpThread.setPakMk(staProtocolnew.getSiteId(), false);
                    devpThread.setReportSign(staProtocolnew.getSiteId(), true);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocolnew));
                    if (!result) {
                        throw new CoolException("更新plc站点信息失败==>驱动码垛位托盘前进失败！");

 src/main/java/com/zy/core/DevpThread.java

@@ -9,5 +9,6 @@
    Map<Integer, StaProtocol> getStation();

    void setPakMk(Integer siteId, boolean pakMk);
    void setReportSign(Integer siteId, boolean pakMk);

}

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

@@ -80,6 +80,8 @@

    // Super有无信息
    private boolean loadingSuper = true;
    private boolean reportSign = false;
    private int reportSignCount = 1;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
@@ -95,6 +97,14 @@
        if (siteId == 213 && autoing && (loadingSuper || loading)){
            basDevp.setReportSign(1);
        }
        if (reportSign){
            basDevp.setReportSign(0);
            reportSignCount++;
        }
        if (reportSignCount>3){
            reportSign = false;
            reportSignCount = 0;
        }
        basDevp.setInEnable(inEnable?"Y":"N");
        basDevp.setOutEnable(outEnable?"Y":"N");
        basDevp.setLocType1((short) 0);  // 高低类型{0:未知,1:低库位,2:高库位}

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -593,6 +593,17 @@
        }
    }

    /**
     * 设置入库标记
     */
    @Override
    public void setReportSign(Integer siteId, boolean pakMk) {
        StaProtocol staProtocol = station.get(siteId);
        if (null != staProtocol) {
            staProtocol.setReportSign(pakMk);
        }
    }

    @Override
    public void close() {
        siemensS7Net.ConnectClose();