From 51298f918494483fa9d72606ca44c241efda63ab Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 1 Sep 2020 14:56:03 +0800 Subject: [PATCH] . --- .../order/ordertemp/OrderTempSyncService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 0a0d3f7..987fa71 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -266,6 +266,17 @@ public class OrderTempSyncService { return Result.failedstr("未查到有效的单价信息"); } + OrderclusterTruck ot = OrderclusterTruck.dao.findFirst("select * from ordercluster_truck t \n" + + " where t.truck_license = ? \n" + + " and t.ordercluster_id = ? ", + transport.getTruckLicense(), + ordercluster_id + ); + + if (ot == null) { + return Result.failedstr("【%s】不是今日分配车辆", transport.getTruckLicense()); + } + BigDecimal min = new BigDecimal(0.001); Date now = new Date(); SyncTask synctask = new SyncTask(); @@ -493,9 +504,9 @@ public class OrderTempSyncService { OrderclusterTruck ot = OrderclusterTruck.dao.findFirst("select * from ordercluster_truck t \n" + " where t.truck_license = ? \n" + - " and t.valid_date = ? ", + " and t.ordercluster_id = ? ", transport.getTruckLicense(), - DateTimeUtil.sdf.get().format(transport.getInTime()) + ordercluster_id ); if (ot == null) {