diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java index 8ff6d6d..f6eeae2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java @@ -20,7 +20,9 @@ public class TruckWeightLimitModifyLogController extends Controller { public void find(){ PageParam pp = getBean(PageParam.class, "", true); String truck_license = get("truck_license"); - renderJson(Result.object(TruckWeightLimitModifyLogService.me.find(pp, truck_license))); + String stm = get("stm"); + String etm = get("etm"); + renderJson(Result.object(TruckWeightLimitModifyLogService.me.find(pp, truck_license, stm, etm))); } @@ -38,6 +40,8 @@ public class TruckWeightLimitModifyLogController extends Controller { */ public void list(){ String truck_license = get("truck_license"); - renderJson(Result.object(TruckWeightLimitModifyLogService.me.list(truck_license))); + String stm = get("stm"); + String etm = get("etm"); + renderJson(Result.object(TruckWeightLimitModifyLogService.me.list(truck_license, stm, etm))); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java index 9cc8518..cf567be 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java @@ -19,10 +19,9 @@ import java.util.List; * PrimaryKey: id */ public class TruckWeightLimitModifyLogService extends BaseService { - private static final Log log = Log.getLog(TruckWeightLimitModifyLogService.class); public static final TruckWeightLimitModifyLogService me = new TruckWeightLimitModifyLogService(); - public Page find(PageParam pp, String truck_license) { + public Page find(PageParam pp, String truck_license, String stm, String etm) { String selectsql = "select * "; String fromsql = "from truck_weight_limit_modify_log t where 1=1 "; List paraList = new ArrayList<>(); @@ -32,6 +31,16 @@ public class TruckWeightLimitModifyLogService extends BaseService { paraList.add("%" + truck_license.trim() + "%"); } + if (StrKit.notBlank(stm)) { + fromsql += " and t.change_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.change_time <= ? \n"; + paraList.add(etm); + } + String totalRowSql = "select count(*) " + fromsql; String findSql = selectsql + fromsql; @@ -51,11 +60,22 @@ public class TruckWeightLimitModifyLogService extends BaseService { return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); } - public List list(String truck_license) { - String sql = "select * from truck_weight_limit_modify_log t where 1=1\n"; + public List list(String truck_license, String stm, String etm) { + String sql = "select * from truck_weight_limit_modify_log t where 1=1 "; + List paraList = new ArrayList<>(); if (StrKit.notBlank(truck_license)) { - sql += " and t.truck_license like %" + truck_license.trim() + "%"; + sql += " and t.truck_license = ?"; + paraList.add(truck_license); } - return TruckWeightLimitModifyLog.dao.find(sql); + if (StrKit.notBlank(stm)) { + sql += " and t.change_time >= ?"; + paraList.add(stm); + } + if (StrKit.notBlank(etm)) { + sql += " and t.change_time <= ?"; + paraList.add(etm); + } + + return Db.find(sql, paraList.toArray()); } } 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 fb0d734..5b24993 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 @@ -250,6 +250,10 @@ public class OutController extends Controller implements Runnable { log.debug("%s 【%s】上磅后,控制LED显示称重结果【%s】", getWhich(), pair.license, weight); try { + // 如果对应的车辆有限重配置则判断限重配置是否超标,如果没有则用系统默认的限重配置判断 + // 如果超重则在LED上显示超重信息 + + BigDecimal total_price = OrderclusterService.me.getTotalPriceByLicense(CliCacheData.SUP.getId(), pair.license, weight); log.debug("%s 【%s】总价 %s 元", getWhich(), pair.license, total_price);