Commit 68bec6cf authored by hywang's avatar hywang

1.修复性能测定重量带不过来的bug

parent bb5c5da0
...@@ -574,9 +574,9 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve ...@@ -574,9 +574,9 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
if (eventType.getAction().equals(EventTag.EVENT_WEIGHT_DATA_BASICS)) { if (eventType.getAction().equals(EventTag.EVENT_WEIGHT_DATA_BASICS)) {
Double weightNum = Double.parseDouble(eventType.getObj().toString().trim()); Double weightNum = Double.parseDouble(eventType.getObj().toString().trim());
if (weightNum > 25) { if (weightNum > 25) {
scanRfid();
if (isWeightScan) if (isWeightScan)
Configs.tempWeight = weightNum; Configs.tempWeight = weightNum;
scanRfid();
isWeightScan = false; isWeightScan = false;
} else { } else {
String lastWeight = weight.get(); String lastWeight = weight.get();
......
...@@ -656,9 +656,9 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor ...@@ -656,9 +656,9 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
if (eventType.getAction().equals(EventTag.EVENT_WEIGHT_DATA_WEIGHT)) { if (eventType.getAction().equals(EventTag.EVENT_WEIGHT_DATA_WEIGHT)) {
Double weightNum = Double.parseDouble(eventType.getObj().toString().trim()); Double weightNum = Double.parseDouble(eventType.getObj().toString().trim());
if (weightNum > 25) { if (weightNum > 25) {
scanRfid();
if (isWeightScan) if (isWeightScan)
Configs.tempWeight = weightNum; Configs.tempWeight = weightNum;
scanRfid();
isWeightScan = false; isWeightScan = false;
} else { } else {
if (weight.get() != null && weight.get() > 25) { if (weight.get() != null && weight.get() > 25) {
......
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