#

LSH

2023-07-10 495b677051e2cbb6a26c0f1e55d9b7f85c5cb9f3

#

 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java

@@ -19,4 +19,5 @@
    List<BasDevp> getLoading(@Param("sour") Integer sour);

    BasDevp selectByWrkNo(Integer wrkNo);
    BasDevp selectByDevNo(Integer devNo);
}

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

@@ -387,6 +387,9 @@
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(staNo);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    BasDevp basDevp = basDevpMapper.selectByDevNo(300);
                    basDevp.setWrkNo1(wrkMast.getWrkNo());
                    basDevpService.selectById(basDevp);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (!result) {
                        News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());

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

@@ -9,6 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
@@ -176,6 +177,12 @@

                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);
                }else if (staProtocol.getSiteId().equals(300)){
                    BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
                    BasDevp basDevp = basDevpMapper.selectByDevNo(300);
                    if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
                        staProtocol.setPakMk(true);
                    }
                }
            }
        }

 src/main/resources/mapper/BasDevpMapper.xml

@@ -84,4 +84,11 @@
        </if>
    </select>

    <select id="selectByDevNo" resultMap="BaseResultMap">
        select top 1 *
        from asr_bas_devp
        where 1=1
        and dev_no = #{devNo}
    </select>

</mapper>