#

zc

2025-05-01 1503a5ccffbf2448d15ac662ad949521a189a2c7

#

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

@@ -291,6 +291,9 @@
                                        .setJson(JSON.toJSONString(hashMap))
                                        .build()
                                        .doPost();
//                                if (!Cools.isEmpty(msg)&&"请先组托".equalsIgnoreCase(msg)){
//                                    ledThread.error(msg);
//                                }
                                News.error("入库申请失败，任务数据={}，请求响应={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
                            }
                        } catch (Exception e) {
@@ -375,6 +378,9 @@
                                            .setJson(JSON.toJSONString(hashMap))
                                            .build()
                                            .doPost();
//                                    if (!Cools.isEmpty(msg)&&"请先组托".equalsIgnoreCase(msg)){
//                                        ledThread.error(msg);
//                                    }
                                    News.error("入库申请失败，任务数据={}，请求响应={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
                                }
                            } catch (Exception e) {
@@ -1529,6 +1535,11 @@
                            notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//触发通知
                        } else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_12.sts) {
                            wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_13.sts);
                            WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkMast.getMainWrkNo());
                            if (wrkMast1 != null) {
                                wrkMast1.setShuttleNo(wrkMast.getShuttleNo());
                                log.info("对主工作档进行绑定小车，为了小车进行移车,{},{}", wrkMast1.getWrkNo(), wrkMast.getShuttleNo());
                            }
                            shuttleThread.setSyncTaskNo(0);
                            notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//触发通知
                        } else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_10.sts) {

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

@@ -220,6 +220,15 @@
                News.info("{}号提升机对象不存在", wrkMast.getLiftNo());
                return false;
            }
            //当1011入库，托盘在提升机里，1014也在入库，待机位被1014占住，去提升机里的任务，小车会卡住
            if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() == 1015) {
                News.info("{}任务，{}号提升机，提升机内有托盘且在1层需要小车去接，就不要占住待机位，禁止派发", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
                return false;//提升机内无小车
            }
            if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() == 1026) {
                News.info("{}任务，{}号提升机，提升机内有托盘且在5层需要小车去接，就不要占住待机位，禁止派发", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
                return false;//提升机内无小车
            }

            //获取提升机待机位
            String liftStandByLocNo = liftThread.getLiftStandByLocNo(Utils.getLev(shuttleProtocol.getCurrentLocNo()), true);
@@ -439,7 +448,6 @@
                News.info("{}号提升机对象不存在", wrkMast.getLiftNo());
                return false;
            }



            if (!liftThread.isIdle()) {