From cd976a076f2357e6705952dee7f0af3031fc0dfa Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 3 Mar 2023 14:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/mapper/PlaceMapper.java |  8 +++
 .../depository_manage/mapper/PlaceMapper.xml  | 14 ++++-
 .../service/impl/DepositoryServiceImpl.java   | 38 ++++++++++--
 .../depository_manage/TestOther.java          | 62 -------------------
 .../depository_manage/mapper/PlaceMapper.xml  | 14 ++++-
 5 files changed, 65 insertions(+), 71 deletions(-)
 delete mode 100644 src/test/java/com/dreamchaser/depository_manage/TestOther.java

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
index 5fc4f37c..dd99cc1d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
@@ -183,4 +183,12 @@ public interface PlaceMapper {
      * @return
      */
     Integer findPlaceCoutnByTypeForFlag(Map<String,Object> map);
+
+
+    /**
+     * 查询当前仓库下的托盘
+     * @param did
+     * @return
+     */
+    List<Place> findTrayByDepositoryId(Integer did);
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 4b09f514..20bb1ade 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -156,6 +156,16 @@
         </if>
     </select>
 
+    <select id="findTrayByDepositoryId" resultMap="placeMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM place p WHERE 1 = 1
+        <if test="did != null and did != ''">
+            AND p.did = #{did}
+        </if>
+        and p.flagForType = 2
+    </select>
+
     <select id="findPlaceCountByCondition" parameterType="map" resultType="int">
         SELECT
         count(*)
@@ -365,11 +375,11 @@
 
     <!--获取当前仓库下的行-->
     <select id="findPlaceXByDid" parameterType="int" resultType="int">
-         select  DISTINCT x from place where did = #{did}  and state != 3 ORDER BY x desc
+         select  DISTINCT x from place where did = #{did}  and state != 3 and x is not null ORDER BY x desc
     </select>
     <!--获取当前仓库下的列-->
     <select id="findPlaceYByDid" parameterType="map" resultType="int">
-         select  DISTINCT y from place where did = #{did} and x = #{x} and state != 3 ORDER BY y desc
+         select  DISTINCT y from place where did = #{did} and x = #{x} and state != 3  ORDER BY y desc
     </select>
     <!--获取当前仓库下的ceng-->
     <select id="findPlaceZByDid" parameterType="map" resultType="int">
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
index 556579be..a90c4c4d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
@@ -280,10 +280,10 @@ public class DepositoryServiceImpl implements DepositoryService {
         for (Depository d : depositoryList
         ) {
             if (Integer.compare(depository.getParentId(), d.getId()) == 0) {
-                if(Integer.compare(0,d.getParentId()) == 0){
+                if (Integer.compare(0, d.getParentId()) == 0) {
                     return d;
-                }else{
-                    return findParentDepository(d,depositoryList);
+                } else {
+                    return findParentDepository(d, depositoryList);
                 }
             }
         }
@@ -450,6 +450,9 @@ public class DepositoryServiceImpl implements DepositoryService {
         exs.shutdown();
         // 用于判断当前列表中是否有所有上级
         for (int i = 0; i < list.size(); i++) {
+            if (list.get(i) == null) {
+                continue;
+            }
             JSONObject jsonObject = new JSONObject((Map<String, Object>) list.get(i));
             Integer parentId = jsonObject.getInteger("parentId");
             if (Integer.compare(parentId, 0) != 0) {
@@ -493,6 +496,25 @@ public class DepositoryServiceImpl implements DepositoryService {
                     result.add(placeX);
                 }
             }
+            List<Place> trayByDepositoryId = placeMapper.findTrayByDepositoryId(d.getId());
+            if (trayByDepositoryId.size() > 0) {
+                Map<String, Object> tray = new HashMap<>();
+                tray.put("title", "托盘");
+                tray.put("id", -1);
+                List<Object> children = new ArrayList<>();
+                for (Place trayp : trayByDepositoryId
+                ) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("title", trayp.getCode());
+                    map.put("id", d.getId() + "-" + trayp.getId());
+                    children.add(map);
+                }
+                tray.put("children", children);
+                // 获取该仓库该排的列数
+                result.add(tray);
+            }
+
+
             return result;
         } else {
             return null;
@@ -524,6 +546,9 @@ public class DepositoryServiceImpl implements DepositoryService {
         // 定义树结构
         List<Object> result = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
+            if(list.get(i) == null){
+                continue;
+            }
             // 构造为jsonObject类
             JSONObject jsonObject = new JSONObject((Map<String, Object>) list.get(i));
             // 获取当前父级id
@@ -546,8 +571,11 @@ public class DepositoryServiceImpl implements DepositoryService {
      * @return
      */
     public Boolean checkList(List<Object> list, Integer parentId) {
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = new JSONObject((Map<String, Object>) list.get(i));
+        for (Object o : list) {
+            if (o == null) {
+                continue;
+            }
+            JSONObject jsonObject = new JSONObject((Map<String, Object>) o);
             Integer pid = jsonObject.getInteger("id");
             if (Integer.compare(pid, parentId) == 0) {
                 return true;
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java
deleted file mode 100644
index 1abae9e5..00000000
--- a/src/test/java/com/dreamchaser/depository_manage/TestOther.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.dreamchaser.depository_manage;
-
-
-import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
-import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
-import com.dreamchaser.depository_manage.service.DepositoryRecordService;
-import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.oned.Code128Writer;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SpringBootTest
-@RunWith(SpringRunner.class)
-public class TestOther {
-
-
-    @Autowired
-    DepositoryRecordService depositoryRecordService;
-
-    @Autowired
-    RedisTemplate<String, String> redisTemplate;
-
-
-    @Test
-    public void Test() throws IOException {
-        String spNo = "202302230023";
-        String mainId = (String) redisTemplate.opsForHash().get(spNo, "mainId");
-        ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details();
-        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
-        approver.setUserId("PangFuZhen");
-        finalApprovalInfo_details.setApprover(approver);
-        String crypt = "4dc6ed4606a02bb4df643536b80cc48b";
-        String spStatus = "2";
-        depositoryRecordService.reviewByQyWxApprovalIn(mainId, finalApprovalInfo_details,crypt,spStatus,spNo);
-
-    }
-
-
-
-}
-
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 4b09f514..20bb1ade 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -156,6 +156,16 @@
         </if>
     </select>
 
+    <select id="findTrayByDepositoryId" resultMap="placeMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM place p WHERE 1 = 1
+        <if test="did != null and did != ''">
+            AND p.did = #{did}
+        </if>
+        and p.flagForType = 2
+    </select>
+
     <select id="findPlaceCountByCondition" parameterType="map" resultType="int">
         SELECT
         count(*)
@@ -365,11 +375,11 @@
 
     <!--获取当前仓库下的行-->
     <select id="findPlaceXByDid" parameterType="int" resultType="int">
-         select  DISTINCT x from place where did = #{did}  and state != 3 ORDER BY x desc
+         select  DISTINCT x from place where did = #{did}  and state != 3 and x is not null ORDER BY x desc
     </select>
     <!--获取当前仓库下的列-->
     <select id="findPlaceYByDid" parameterType="map" resultType="int">
-         select  DISTINCT y from place where did = #{did} and x = #{x} and state != 3 ORDER BY y desc
+         select  DISTINCT y from place where did = #{did} and x = #{x} and state != 3  ORDER BY y desc
     </select>
     <!--获取当前仓库下的ceng-->
     <select id="findPlaceZByDid" parameterType="map" resultType="int">