From 2279385420b2e98c743718470b515889ee0ebcf9 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Fri, 22 Oct 2021 14:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=A8=E5=9C=BA=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/ssjygl/transport/TransportService.java | 5 +++-- .../src/main/java/com/cowr/local/ssjygl/main/Config.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index 4ff8b3c..87451fa 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -128,12 +128,13 @@ public class TransportService extends BaseService { " select t.truck_license, t.ordercluster_id from (\n" + " select t.truck_license, max(c.id) ordercluster_id from ordercluster_truck t\n" + " left join ordercluster c on t.ordercluster_id = c.id\n" + - " where c.start_time <= ? \n" + + " where c.state < 5 \n" + + " and c.start_time <= ? \n" + " and c.cutoff_time >= ? \n" + " group by t.truck_license\n" + " ) t\n" + " ) a on a.truck_license = t.truck_license\n" + - " left join ordercluster c on a.ordercluster_id = c.id\n" + + " left join ordercluster c on a.ordercluster_id = c.id and c.state < 5 \n" + " where t.state < 5\n" + " and t.supermarket_id = ? \n" + " order by t.flag, t.out_time desc "; 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 0cbe5b9..8fc8a57 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 @@ -103,7 +103,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 = "20211016"; + public static final String CLINET_VERSION = "20211022"; public static String getRootPath() { return PathKit.getWebRootPath()