解决提升机在本层，而没有锁提升机的问题

zc

2025-05-07 dc3483f84d517bfa2cbcc96a0c965f26d63aa3c3

解决提升机在本层，而没有锁提升机的问题

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

@@ -383,6 +383,7 @@
                //提升机在小车楼层
                wrkMast.setWrkSts(WrkStsType.MOVE_IN_NO_LIFT_6.sts);//小车移动到提升机中  小车移动至站点完成 ==> 提升机至小车层完成
                wrkMast.setModiTime(now);
                wrkMast.setLiftNo(1);
                wrkMastService.updateById(wrkMast);
                return false;
            }

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

@@ -341,6 +341,7 @@
                //提升机在小车楼层
                wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_5.sts);//小车移动到提升机中  小车移动至站点完成 ==> 提升机至小车层完成
                wrkMast.setModiTime(now);
                wrkMast.setLiftNo(1);
                wrkMastService.updateById(wrkMast);
                return false;
            }
@@ -409,7 +410,7 @@
                return false;
            }

            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
            LiftThread liftThread = LiftUtils.getRecentLift(shuttleProtocol.getCurrentLocNo());
            LiftProtocol liftProtocol = liftThread.getStatus();
            if (liftProtocol == null) {
                 News.taskInfo(wrkMast.getWrkNo(),"{}号提升机对象不存在", 1);

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

@@ -263,6 +263,7 @@
                //提升机在小车楼层
                wrkMast.setWrkSts(WrkStsType.MOVE_LIFT_TO_SHUTTLE_COMPLETE_TRANSPORT_LIFT.sts);//小车移动到提升机中  小车移动至站点完成 ==> 提升机至小车层完成
                wrkMast.setModiTime(now);
                wrkMast.setLiftNo(liftProtocol.getLiftNo());//提前锁定提升机
                wrkMastService.updateById(wrkMast);
                return false;
            }

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

@@ -308,6 +308,7 @@
                //提升机在小车楼层
                wrkMast.setWrkSts(WrkStsType.MOVE_LIFT_TO_SHUTTLE_COMPLETE_TRANSPORT_LIFT_OUT.sts);//小车移动到提升机中  小车移动至站点完成 ==> 提升机至小车层完成
                wrkMast.setModiTime(now);
                wrkMast.setLiftNo(liftProtocol.getLiftNo());//提前锁定提升机
                wrkMastService.updateById(wrkMast);
                return false;
            }

 src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java

@@ -423,11 +423,11 @@


                //检测目标楼层车数量是否小于允许的最大数量
                boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
                if (!checkDispatchMaxNum) {
                    News.info("{}任务，{}层，已经达到当前楼层调度车辆最大值", wrkMast1.getWrkNo(), lev);
                    return false;
                }
//                boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
//                if (!checkDispatchMaxNum) {
//                    News.info("{}任务，{}层，已经达到当前楼层调度车辆最大值", wrkMast1.getWrkNo(), lev);
//                    return false;
//                }

                for (ShuttleThread shuttleThread : diffLev) {
                    ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();

 src/main/resources/application.yml

@@ -11,7 +11,7 @@
      validation-timeout: 3000
      connection-test-query: select 1
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://192.168.10.201:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
  mvc: