#改造

cpT

2025-07-03 4da282d3a87fb648ae6865929f5862b27d05a562

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

@@ -55,7 +55,7 @@
                    String s = new String(read);
                    if (!Cools.isEmpty(s) && s.startsWith("\u0002+")) {
//                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
                        scale = Double.parseDouble(s.substring(1))/100;
                        scale = Double.parseDouble(s.substring(1));

//                        System.out.println("scale:"+scale+ "ip:"+slave.getIp());
//                        String substring = s.substring(1);
@@ -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();
@@ -80,7 +83,7 @@
                                    OutputQueue.SCALE.offer(jsonObject);
                                }
                            } catch (Exception e){
                                log.error("称重模块异常"+e.getMessage());
                                log.error("称重模块异常"+e .getMessage());
                            }
//                            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
//                            BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
@@ -122,13 +125,23 @@
            dataOutputStream = new DataOutputStream(socket.getOutputStream());
            dataInputStream = new DataInputStream(socket.getInputStream());
//            log.info("条码扫描仪连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//            deviceErrorService.deleteDeviceError("scale", slave.getId());
            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.deleteDeviceError("Scale", slave.getId());
            } catch (Exception e){
//                log.error("e:"+e.getMessage());
            }
        } catch (Exception e) {
            socket = null;
            log.error("磅秤连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//            log.error("磅秤连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//            deviceErrorService.addDeviceError("scale", slave.getId(), "磅秤连接失败");
            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.deleteDeviceError("Scale", slave.getId());
            } catch (Exception e1){
//                log.error("e:"+e1.getMessage());
            }
            return false;
        }
        return true;
@@ -195,4 +208,12 @@
        return true;
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}