From b1a99adb0d483256416ca15fec454377a9c045b8 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 14 Sep 2020 23:23:51 +0800 Subject: [PATCH] . --- .../transport/TransportSyncService.java | 25 +++++++------------ .../receive/InvoiceReceiveSyncService.java | 2 +- .../ordercluster/OrderclusterSyncService.java | 6 ++--- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index c19de69..1bd915c 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -233,9 +233,9 @@ public class TransportSyncService { TransportDeviceService.me.addLicenseHistory(lichisobj, which, lichisobj.get("trans_co_id") != null ? TruckRodState.state_2 : TruckRodState.state_1); - if (ot == null && !AuthLicenseService.me.isAuthLicense(result.getLicense())) { - log.error("【%s】未授权，可能是在黑名单中，或者第一次入场", result.getLicense()); - Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未授权。可能是在黑名单中，或者第一次入场")); + if (ot == null ) { + log.error("【%s】未授权，可能是在黑名单中", result.getLicense()); + Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未授权。可能是在黑名单中")); return result; } @@ -344,8 +344,8 @@ public class TransportSyncService { // 从预付费车辆中找 OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, result.getLicense()); - if (ot == null && !AuthLicenseService.me.isAuthLicense(result.getLicense())) { - log.error("车牌【%s】未授权，可能是在黑名单中，或者第一次入场", result.getLicense()); + if (ot == null ) { + log.error("车牌【%s】未授权，可能是在黑名单中", result.getLicense()); //TODO: 发消息到web端？ return result; } @@ -583,8 +583,8 @@ public class TransportSyncService { OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); - if (ot == null && !AuthLicenseService.me.isAuthLicense(truck_license)) { - return Result.failedstr("车牌【%s】未授权，或者第一次入场", truck_license); + if (ot == null ) { + return Result.failedstr("车牌【%s】未授权", truck_license); } Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license); @@ -611,13 +611,6 @@ public class TransportSyncService { @Override public boolean run() { try { - if (!AuthLicenseService.me.isAuthLicense(truck_license)) { - AuthLicense authlic = new AuthLicense(); - authlic.setTruckLicense(truck_license); - - authlic.save(); - } - return transport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(transport)) && ModifyLogService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser); @@ -653,8 +646,8 @@ public class TransportSyncService { // 是预付，则肯定是销售或者外销，如果有物流公司id，则肯定是销售，否是外销 OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); - if (ot == null && !AuthLicenseService.me.isAuthLicense(truck_license)) { - return Result.failedstr("车牌【%s】未授权，或者第一次入场", truck_license); + if (ot == null ) { + return Result.failedstr("车牌【%s】未授权", truck_license); } Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java index 9759a36..35b8db4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java @@ -35,7 +35,7 @@ public class InvoiceReceiveSyncService extends BaseSyncService { return Result.failed("砂站信息无效"); } - if(supermarket.getIsdeploy() == 1){ + if (supermarket.getIsdeploy() == 0) { return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 869a63f..ef25d68 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -88,7 +88,7 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failed("砂站信息无效"); } - if(supermarket.getIsdeploy() == 1){ + if(supermarket.getIsdeploy() == 0){ return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); } @@ -218,7 +218,7 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failed("砂站信息无效"); } - if(supermarket.getIsdeploy() == 1){ + if(supermarket.getIsdeploy() == 0){ return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); } @@ -395,7 +395,7 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failed("砂站信息无效"); } - if(supermarket.getIsdeploy() == 1){ + if(supermarket.getIsdeploy() == 0){ return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); }