From 706f8e2daeacdc4618a146e530533c43ab28dd9b Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Tue, 14 Sep 2021 11:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=8E=82=E8=B6=85?=
 =?UTF-8?q?=E9=87=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/ordertemp/OrderTempSyncService.java | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 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 3b2817c..fb7848d 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
@@ -92,15 +92,22 @@ public class OrderTempSyncService {
             return Result.failedstr("重量数据有误，第一次称重：%.4f，第二次称重：%.4f", transport.getFirstWeight(), transport.getSecondWeight());
         }
 
-        BigDecimal weightLimit;
-        TruckWeightLimit truckWeightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
-        if (truckWeightLimit != null) {
-            weightLimit = truckWeightLimit.getWeightLimit();
+        BigDecimal truckWeightLimit;
+        BigDecimal minWeightLimit;
+        BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+        TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
+        if (weightLimit != null) {
+            truckWeightLimit = weightLimit.getWeightLimit();
+            if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) {
+                minWeightLimit = supermarketWeightLimit;
+            } else {
+                minWeightLimit = truckWeightLimit;
+            }
         } else {
-            weightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+            minWeightLimit = supermarketWeightLimit;
         }
-        if (transport.getSecondWeight().compareTo(weightLimit) > 0) {
-            return Result.failedstr("毛重不能超过 %d 吨", weightLimit);
+        if (transport.getSecondWeight().compareTo(minWeightLimit) > 0) {
+            return Result.failedstr("毛重不能超过 %.2f 吨", minWeightLimit);
         }
 
         BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次
@@ -338,15 +345,22 @@ public class OrderTempSyncService {
             return Result.failedstr("重量数据有误，第一次称重：%.2f，第二次称重：%.2f", transport.getFirstWeight(), transport.getSecondWeight());
         }
 
-        BigDecimal weightLimit;
-        TruckWeightLimit truckWeightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
-        if (truckWeightLimit != null) {
-            weightLimit = truckWeightLimit.getWeightLimit();
+        BigDecimal truckWeightLimit;
+        BigDecimal minWeightLimit;
+        BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+        TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
+        if (weightLimit != null) {
+            truckWeightLimit = weightLimit.getWeightLimit();
+            if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) {
+                minWeightLimit = supermarketWeightLimit;
+            } else {
+                minWeightLimit = truckWeightLimit;
+            }
         } else {
-            weightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+            minWeightLimit = supermarketWeightLimit;
         }
-        if (transport.getSecondWeight().compareTo(weightLimit) > 0) {
-            return Result.failedstr("毛重不能超过 %d 吨", weightLimit);
+        if (transport.getSecondWeight().compareTo(minWeightLimit) > 0) {
+            return Result.failedstr("毛重不能超过 %.2f 吨", minWeightLimit);
         }
 
         BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次
@@ -683,15 +697,22 @@ public class OrderTempSyncService {
             return Result.failedstr("重量数据有误，第一次称重：%.4f，第二次称重：%.4f", transport.getFirstWeight(), transport.getSecondWeight());
         }
 
-        BigDecimal weightLimit;
-        TruckWeightLimit truckWeightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
-        if (truckWeightLimit != null) {
-            weightLimit = truckWeightLimit.getWeightLimit();
+        BigDecimal truckWeightLimit;
+        BigDecimal minWeightLimit;
+        BigDecimal supermarketWeightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+        TruckWeightLimit weightLimit = TruckWeightLimit.dao.findById(transport.getTruckLicense());
+        if (weightLimit != null) {
+            truckWeightLimit = weightLimit.getWeightLimit();
+            if (truckWeightLimit.compareTo(supermarketWeightLimit) > 0) {
+                minWeightLimit = supermarketWeightLimit;
+            } else {
+                minWeightLimit = truckWeightLimit;
+            }
         } else {
-            weightLimit = BigDecimal.valueOf(Config.configprop.getInt("weigh.max"));
+            minWeightLimit = supermarketWeightLimit;
         }
-        if (transport.getSecondWeight().compareTo(weightLimit) > 0) {
-            return Result.failedstr("毛重不能超过 %d 吨", weightLimit);
+        if (transport.getSecondWeight().compareTo(minWeightLimit) > 0) {
+            return Result.failedstr("毛重不能超过 %.2f 吨", minWeightLimit);
         }
 
         BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次