Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs

whycq

2024-10-22 85ce1fa2f3d894cce2be0faa24551dfca7896ac9

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

@@ -1040,10 +1040,10 @@
     * 设置入库标记
     */
    @Override
    public void setPakMk(Integer siteId, boolean pakMk) {
    public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
        StaProtocol staProtocol = station.get(siteId);
        if (null != staProtocol) {
            log.info("锁定入库标记，站点号={};pakMk={};时间={}",siteId,pakMk,new Date());
            log.info("锁定入库标记，站点号={};pakMk={};时间={};标记={}",siteId,pakMk,new Date(),i);
            staProtocol.setPakMk(pakMk);
        }
    }