#

zwl

2025-04-17 0a379c6fefa6dee0ce4436a25fb78d0da4ba6793

#

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

@@ -1772,9 +1772,14 @@
                continue;
            }

            List<Integer> liftAllStaNo = ForkLiftUtils.getLiftAllStaNo(liftNo);
            if (liftAllStaNo.isEmpty()) {
                continue;
            }

            //获取入库任务
            List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                    .eq("lift_no", liftNo)
                    .in("sta_no", liftAllStaNo)
                    .in("wrk_sts"
                            , WrkStsType.NEW_INBOUND.sts
                            , WrkStsType.INBOUND_DEVICE_RUN.sts
@@ -1786,7 +1791,7 @@

            //获取出库任务
            List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                    .eq("lift_no", liftNo)
                    .in("source_sta_no", liftAllStaNo)
                    .in("wrk_sts"
                            , WrkStsType.NEW_OUTBOUND.sts
                            , WrkStsType.OUTBOUND_SHUTTLE_RUN.sts

 src/main/java/com/zy/common/utils/ForkLiftUtils.java

@@ -24,6 +24,21 @@
 */
public class ForkLiftUtils {

    //获取提升机所有站点
    public static List<Integer> getLiftAllStaNo(Integer liftNo) {
        List<Integer> list = new ArrayList<>();
        ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
        if (forkLiftThread == null) {
            return list;
        }

        for (ForkLiftStaProtocol forkLiftStaProtocol : forkLiftThread.getForkLiftStaProtocols()) {
            list.add(forkLiftStaProtocol.getStaNo());
        }

        return list;
    }

    //获取提升机站点
    public static ForkLiftStaProtocol getLiftStaByStaNo(Integer staNo) {
        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);