From fcf62fcd4af4e0e2d64988b33bc56f93107e6df9 Mon Sep 17 00:00:00 2001
From: zhouhong <zh123412@126.com>
Date: Mon, 13 Mar 2023 16:19:11 +0800
Subject: [PATCH] 超重判断

---
 src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
index 6662b3d..b6639bc 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
@@ -238,8 +238,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         }
         //重量小于50kg,优先放第4层
         List<Location> locationss=null;
+        BigDecimal weight_bigdecimal=new BigDecimal(weight);
         if(StringUtils.isNotEmpty(weight)){
-            BigDecimal weight_bigdecimal=new BigDecimal(weight);
             if(weight_bigdecimal.compareTo(new BigDecimal(200))>0){
                 locationss=locationList.stream().filter(t->{
                     if(t.getILayer()!=4){
@@ -253,7 +253,9 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
             locationList=locationss;
         }else{
             //第4层超过200斤则不能放
-            return null;
+            if(weight_bigdecimal.compareTo(new BigDecimal(200))>0){
+                return null;
+            }
         }
         Location location = locationList.stream().findFirst().orElse(null);
         String locationCode = location.getCode();
--
libgit2 0.22.2