xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改出厂超重判断-2

dev
wuwenxiong 2021-09-14 11:59:11 +08:00
parent 706f8e2dae
commit b03a47c250
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
View File

@ -254,16 +254,23 @@ public class OutController extends Controller implements Runnable {
try { try {
// 如果对应的车辆有限重配置则判断限重配置是否超标，如果没有则用系统默认的限重配置判断 // 如果对应的车辆有限重配置则判断限重配置是否超标，如果没有则用系统默认的限重配置判断
// 如果超重则在LED上显示超重信息 // 如果超重则在LED上显示超重信息
BigDecimal weightLimit; BigDecimal truckWeightLimit;
TruckWeightLimit truckWeightLimit = TruckWeightLimit.dao.findById(pair.license); BigDecimal minWeightLimit;
if (truckWeightLimit != null) { BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
weightLimit = truckWeightLimit.getWeightLimit(); TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(pair.license);
if (weightLimit != null) {
truckWeightLimit = weightLimit.getWeightLimit();
if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) {
minWeightLimit = supermarketWeightLimit;
} else {
minWeightLimit = truckWeightLimit;
}
} else { } 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, "超重"); 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); BigDecimal total_price = OrderclusterService.me.getTotalPriceByLicense(CliCacheData.SUP.getId(), pair.license, weight);