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

车辆限重问题修复

dev
wuwenxiong 2022-01-20 15:54:29 +08:00
parent 4d0b065964
commit b435f3a2df
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
View File

@ -6,7 +6,6 @@ import com.cowr.common.enums.OrderStateEnum;
import com.cowr.common.enums.OrderTypeEnum;
import com.cowr.common.enums.TruckRodState;
import com.cowr.common.utils.DateTimeUtil;
import com.cowr.common.utils.MathUtil;
import com.cowr.common.view.Result;
import com.cowr.local.ssjygl.devicectrl.common.Const;
import com.cowr.local.ssjygl.main.CliCacheData;
@ -803,16 +802,14 @@ public class TransportSyncService {
Date now = new Date();
int first_weight_decimal = MathUtil.getNumberDecimalDigits(first_weight);
int second_weight_decimal = MathUtil.getNumberDecimalDigits(second_weight);
Transport transport = new Transport();
transport.setId(StrKit.getRandomUUID());
transport.setSupermarketId(supermarket_id);
transport.setTruckLicense(truck_license);
transport.setFirstWeight(new BigDecimal(first_weight).setScale(first_weight_decimal, BigDecimal.ROUND_HALF_UP));
transport.setFirstWeight(new BigDecimal(first_weight));
transport.setFirstWeighMode(2);
transport.setInTime(now);
transport.setSecondWeight(new BigDecimal(second_weight).setScale(second_weight_decimal, BigDecimal.ROUND_HALF_UP));
transport.setSecondWeight(new BigDecimal(second_weight));
transport.setSecondWeightMode(2);
transport.setOutTime(now);
transport.setOutWhich(out_which);

4
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java
View File

@ -208,7 +208,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
}
TruckWeightLimit saveold = oldobj.clone();
oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del
oldobj.setDel(Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del
SyncTask synctask = new SyncTask();
@ -307,7 +307,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
BigDecimal truckWeightLimit;
BigDecimal minWeightLimit;
BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(truck_license);
TruckWeightLimit weightLimit = TruckWeightLimit.dao.findFirst("select * from truck_weight_limit where del = 0 and truck_license = ?", truck_license);
if (weightLimit != null) {
truckWeightLimit = weightLimit.getWeightLimit();
if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) {