From 1fd35f224f39d0eaa536f9b459e469bf65cc3cc9 Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Mon, 14 Sep 2020 22:39:00 +0800
Subject: [PATCH] .

---
 .../transport/TransportSyncService.java       |  6 +++++
 .../src/main/resources/dev/config.properties  |  2 +-
 .../receive/InvoiceReceiveSyncService.java    |  7 ++++--
 .../ordercluster/OrderclusterSyncService.java | 22 +++++++++++++++----
 4 files changed, 30 insertions(+), 7 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 cce00b7..c19de69 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
@@ -581,6 +581,12 @@ public class TransportSyncService {
                 return Result.failedstr("车牌【%s】在黑名单中", truck_license);
             }
 
+            OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license);
+
+            if (ot == null && !AuthLicenseService.me.isAuthLicense(truck_license)) {
+                return Result.failedstr("车牌【%s】未授权，或者第一次入场", truck_license);
+            }
+
             Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license);
 
             if (oldtransport != null) {
diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties
index 3308d30..8161eb6 100644
--- a/ssjygl-xsx-local/src/main/resources/dev/config.properties
+++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties
@@ -2,7 +2,7 @@
 devMode=true
 #本地服务 和 云端服务 socket 通信
 socketserver.enable=true
-#socketserver.host=47.112.109.118
+#socketserver.host=120.77.59.235
 socketserver.host=localhost
 socketserver.port=21002
 
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 7f76a3f..9759a36 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
@@ -31,9 +31,12 @@ public class InvoiceReceiveSyncService extends BaseSyncService {
         receive.setReceiveUserName(receive_user.getName());
 
         Supermarket supermarket = SvrCacheData.SUP_CACHE.get(receive.getSupermarketId());
-
         if (supermarket == null) {
-            return Result.failed("未找到对应砂站信息");
+            return Result.failed("砂站信息无效");
+        }
+
+        if(supermarket.getIsdeploy() == 1){
+            return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
         }
 
         try {
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 e15018d..869a63f 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
@@ -83,8 +83,13 @@ public class OrderclusterSyncService extends BaseSyncService {
                 int    mini_truck     = obj.getIntValue("mini_truck");
                 double total_weight   = obj.getDouble("total_weight");
 
-                if (!SvrCacheData.SUP_CACHE.containsKey(supermarket_id)) {
-                    return Result.failedstr("砂站id(%s)错误", supermarket_id);
+                Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id);
+                if (supermarket == null) {
+                    return Result.failed("砂站信息无效");
+                }
+
+                if(supermarket.getIsdeploy() == 1){
+                    return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
                 }
 
                 if (chksup.contains(supermarket_id)) {
@@ -208,8 +213,13 @@ public class OrderclusterSyncService extends BaseSyncService {
             String trucks,
             Sysuser sysuser
     ) {
-        if (!SvrCacheData.SUP_CACHE.containsKey(supermarket_id)) {
-            return Result.failedstr("砂站id(%s)错误", supermarket_id);
+        Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id);
+        if (supermarket == null) {
+            return Result.failed("砂站信息无效");
+        }
+
+        if(supermarket.getIsdeploy() == 1){
+            return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
         }
 
         List<Record> undonlist = OrderclusterService.me.undonlist(supermarket_id, customer_name);
@@ -385,6 +395,10 @@ public class OrderclusterSyncService extends BaseSyncService {
             return Result.failed("砂站信息无效");
         }
 
+        if(supermarket.getIsdeploy() == 1){
+            return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
+        }
+
         Customer customerObj = Customer.dao.findById(model.getCustomerId());
         // 传了客户id时，用后端客户信息填充，否则用前端传的
         if (customerObj != null) {