diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 51e32da..8d6c5fe 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -104,7 +104,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20211111"; + public static final String CLINET_VERSION = "20220103"; public static String getRootPath() { return PathKit.getWebRootPath() diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java index 50ebc8f..ba9b98b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java @@ -80,14 +80,12 @@ public class OrderclusterTruckSyncService extends BaseSyncService { ts.add(0, start_time); // 加到查询参数里面 ts.add(0, cutoff_time); // 加到查询参数里面 - ts.add(0, ordercluster.getSaleType()); ts.add(0, ordercluster_id); // 加到查询参数里面 List chkduk = Db.find( "select * from ordercluster_truck t\n" + " left join ordercluster o on o.id = t.ordercluster_id\n" + " where t.ordercluster_id <> ? \n" + " and o.state < 5 \n" + - " and o.sale_type < ? \n" + " and o.start_time <= ? \n" + " and o.cutoff_time >= ? \n" + " and t.truck_license in (" + StrKit.join(tsql, ",") + ")", ts.toArray());