Skip to content

Z
zhmes-agecal
Commit 23f64090 authored by zhmesagecal's avatar zhmesagecal
Browse files
Options

1 标定处理调整

parent dcc8d7fb
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
zhmes-agecal-system/src/main/java/com/zehong/system/netty/event/CalibrationResultEventHandler.java
View file @ 23f64090
...@@ -145,15 +145,15 @@ public class CalibrationResultEventHandler { ...@@ -145,15 +145,15 @@ public class CalibrationResultEventHandler {
&& "1".equals(palletDeviceBinding.getRunTimeStatus()) && "1".equals(palletDeviceBinding.getRunTimeStatus())
&& "1".equals(palletDeviceBinding.getRealTimeStatus()) && "1".equals(palletDeviceBinding.getRealTimeStatus())
&& "4".equals(palletDeviceBinding.getCalibrationConcentrationStatus()) && "4".equals(palletDeviceBinding.getCalibrationConcentrationStatus())
&& palletDeviceBinding.getWriteSelfCheckStatus() == 1 && palletDeviceBinding.getWriteSelfCheckStatus() != null && palletDeviceBinding.getWriteSelfCheckStatus() == 1
&& palletDeviceBinding.getModuleStatus() == 1 && palletDeviceBinding.getModuleStatus() != null && palletDeviceBinding.getModuleStatus() == 1
&& palletDeviceBinding.getSimCardStatus() == 1 && palletDeviceBinding.getSimCardStatus() != null && palletDeviceBinding.getSimCardStatus() == 1
&& palletDeviceBinding.getNetworkStatus() == 1) { && palletDeviceBinding.getNetworkStatus() != null && palletDeviceBinding.getNetworkStatus() == 1) {
palletDeviceBinding.setStandardInspectResult("1"); palletDeviceBinding.setStandardInspectResult("1");
} }
if(!"2".equals(palletDeviceBinding.getReadingMode())) { if(!"2".equals(palletDeviceBinding.getReadingMode())) {
if(palletDeviceBinding.getRelayStatus() == 1) { if(palletDeviceBinding.getRelayStatus() != null && palletDeviceBinding.getRelayStatus() == 1) {
palletDeviceBinding.setStandardInspectResult("1"); palletDeviceBinding.setStandardInspectResult("1");
} else { } else {
palletDeviceBinding.setStandardInspectResult("0"); palletDeviceBinding.setStandardInspectResult("0");
...@@ -161,7 +161,7 @@ public class CalibrationResultEventHandler { ...@@ -161,7 +161,7 @@ public class CalibrationResultEventHandler {
} }
if(!"1".equals(palletDeviceBinding.getReadingMode())) { if(!"1".equals(palletDeviceBinding.getReadingMode())) {
if(palletDeviceBinding.getPulseStatus() == 1) { if(palletDeviceBinding.getPulseStatus() != null && palletDeviceBinding.getPulseStatus() == 1) {
palletDeviceBinding.setStandardInspectResult("1"); palletDeviceBinding.setStandardInspectResult("1");
} else { } else {
palletDeviceBinding.setStandardInspectResult("0"); palletDeviceBinding.setStandardInspectResult("0");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment