#改造

cpT

2025-07-01 852a6cc97fadbcc5538d14e2667ddb663767e7aa

#改造

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

@@ -1893,6 +1893,15 @@
                if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
                    // 判断是否满足取货条件
                    if (!staProtocol.isLoading()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "无物");
                        return null;
                    }
                    if (!staProtocol.isInEnable()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "等待可入信号");
                        return null;
                    }
                    if (!staProtocol.isStaOk()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "等待链条就绪");
                        return null;
                    }
                    // 尺寸检测异常
@@ -1978,6 +1987,7 @@
                        }
                        return null;
                    }
                    return null;
                }
                return taskWrk;
            }

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

@@ -68,6 +68,9 @@
                                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, slave.getDevpPlcId());
                                StaProtocol staProtocol = devpThread.getStation().get(slave.getStaNo());
                                if (staProtocol != null) {
                                    if (scale>10000){
                                        scale = scale-10000;
                                    }
                                    devpThread.setGrossWt(staProtocol.getSiteId(), scale);

                                    JSONObject jsonObject = new JSONObject();