diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java index e11932c..ed79a02 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java @@ -254,16 +254,23 @@ public class OutController extends Controller implements Runnable { try { // 如果对应的车辆有限重配置则判断限重配置是否超标,如果没有则用系统默认的限重配置判断 // 如果超重则在LED上显示超重信息 - BigDecimal weightLimit; - TruckWeightLimit truckWeightLimit = TruckWeightLimit.dao.findById(pair.license); - if (truckWeightLimit != null) { - weightLimit = truckWeightLimit.getWeightLimit(); + BigDecimal truckWeightLimit; + BigDecimal minWeightLimit; + BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max")); + TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(pair.license); + if (weightLimit != null) { + truckWeightLimit = weightLimit.getWeightLimit(); + if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) { + minWeightLimit = supermarketWeightLimit; + } else { + minWeightLimit = truckWeightLimit; + } } else { - weightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max")); + minWeightLimit = supermarketWeightLimit; } - if (weightLimit != null && new BigDecimal(weight).compareTo(weightLimit) > 0) { + if (new BigDecimal(weight).compareTo(minWeightLimit) > 0) { getLed().setInfo(pair.license, "超重"); - log.debug("%s 【%s】超重,限重%s吨,称重%s吨", getWhich(), pair.license, weightLimit, weight); + log.debug("%s 【%s】超重,限重%.2f吨,称重%.2f吨", getWhich(), pair.license, minWeightLimit, weight); } BigDecimal total_price = OrderclusterService.me.getTotalPriceByLicense(CliCacheData.SUP.getId(), pair.license, weight);