From f2bde5c6565c7b605e6929be4ff83c7a99670c42 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Sun, 29 Sep 2024 17:58:13 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8C=BA=E5=9F=9F=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/SchBasePointMapper.xml   |  4 ++--
 .../service/impl/SchBasePointServiceImpl.java   | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
index 9040af3..8c1697f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
@@ -59,8 +59,8 @@
     </select>
     <select id="selectPointByRegion" resultType="com.alibaba.fastjson.JSONObject"
             parameterType="java.lang.String">
-        select point_code, point_name
+        select point_code, point_name,point_status
         from sch_base_point
-        where region_code = #{regionCode}
+        where region_code = #{regionCode} and point_type is null
     </select>
 </mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index 9fc1516..c9a66f0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -74,10 +74,9 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
     private ISysParamService iSysParamService;
 
     private final Object lock = new Object();
-
     private final Object lock2 = new Object();
-
     private final Object lock3 = new Object();
+    private final Object lock4 = new Object();
 
 
     @Override
@@ -520,12 +519,22 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
 
     @Override
     public List<JSONObject> selectPointByRegion(String regionCode) {
-        return pointMapper.selectPointByRegion(regionCode);
+        List<JSONObject> jsonObjectList = pointMapper.selectPointByRegion(regionCode);
+        jsonObjectList.stream().forEach(jsonObject -> {
+            if (ObjectUtil.isNotEmpty(jsonObject.get("point_status"))) {
+                if (jsonObject.get("point_status").equals(GoodsEnum.EMPTY_PALLETS.getValue()) || jsonObject.get("point_status").equals(GoodsEnum.IN_STOCK.getValue())) {
+                    jsonObject.put("point_status", "1");
+                }
+            }else{
+                jsonObject.put("point_status", "0");
+            }
+        });
+        return jsonObjectList;
     }
 
     @Override
     public SchBasePoint selectPointByEmpAndRegion(String region_code, String vehicle_code, String s) {
-        synchronized (lock2) {
+        synchronized (lock4) {
             //查询载具的类型
             MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.getById(vehicle_code);
             if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具类型不存在!");