From f1444b0c4cfcc2d472dd270ba667749252f457d0 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 5 Aug 2024 14:48:19 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=8B?=
 =?UTF-8?q?=E6=8C=81=E5=8A=9F=E8=83=BD-=E7=A9=BA=E6=9C=A8=E7=AE=B1?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProductOutTwoController.java   | 11 ++++-
 .../pda/service/ProductOutTwoService.java     | 11 +++++
 .../impl/ProductOutTwoServiceImpl.java        | 25 ++++++++++-
 .../dao/mapper/BstIvtBoxinfoMapper.java       |  7 ++++
 .../dao/mapper/BstIvtBoxinfoMapper.xml        | 41 +++++++++++++++++++
 5 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
index 03682d676..8ec74c83b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
@@ -26,14 +26,14 @@ public class ProductOutTwoController {
     @Autowired
     private ProductOutTwoService productOutTwoService;
 
-    @PostMapping("/ivtQuery")
+    @PostMapping("/ivtQueryTwo")
     @Log("单据初始化查询")
     @SaIgnore
     public ResponseEntity<Object> ivtQuery(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(productOutTwoService.ivtQuery(whereJson), HttpStatus.OK);
     }
 
-    @PostMapping("/ivtDtlQuery")
+    @PostMapping("/ivtDtlQueryTwo")
     @Log("查询点位木箱")
     @SaIgnore
     public ResponseEntity<Object> ivtDtlQuery(@RequestBody JSONObject whereJson) {
@@ -54,4 +54,11 @@ public class ProductOutTwoController {
         return new ResponseEntity<>(productOutTwoService.outConfirm(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/queryBoxIvt")
+    @Log("查询木箱库内库存")
+    @SaIgnore
+    public ResponseEntity<Object> queryBoxIvt(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(productOutTwoService.queryBoxIvt(whereJson), HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
index d063b1203..588e7e248 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
@@ -45,4 +45,15 @@ public interface ProductOutTwoService {
      * @return JSONObject： 返回前端参数
      */
     JSONObject outConfirm(JSONObject whereJson);
+
+    /**
+     * 查询库内空木箱
+     * @param whereJson{
+     *                 material_code：木箱料号
+     *                 material_name：木箱描述
+     *                 box_no：木箱号
+     * }
+     * @return JSONObject： 返回前端参数
+     */
+    JSONObject queryBoxIvt(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
index bb407432f..e43f3f506 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pda.service.ProductOutTwoService;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
+import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.pda.st.service.impl.ProductionOutServiceImpl;
@@ -14,7 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -27,14 +30,20 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
     @Autowired
     private IBstIvtBoxlashboundService iBstIvtBoxlashboundService;
 
+    /**
+     * 木箱信息mapper
+     */
+    @Resource
+    private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
+
     @Override
     public JSONObject ivtQuery(JSONObject whereJson) {
-        return new ProductionOutServiceImpl().ivtQuery(whereJson);
+        return new ProductionOutServiceImpl().ivtQueryTwo(whereJson);
     }
 
     @Override
     public JSONObject ivtDtlQuery(JSONObject whereJson) {
-        return new ProductionOutServiceImpl().ivtDtlQuery(whereJson);
+        return new ProductionOutServiceImpl().ivtDtlQueryTwo(whereJson);
     }
 
     @Override
@@ -95,4 +104,16 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
         result.put("message", "解绑成功!");
         return result;
     }
+
+    @Override
+    public JSONObject queryBoxIvt(JSONObject whereJson) {
+
+        List<Map> boxIvtPda = this.bstIvtBoxinfoMapper.getBoxIvtPda(whereJson);
+
+        JSONObject jo = new JSONObject();
+        jo.put("data", boxIvtPda);
+        jo.put("message", "查询成功!");
+        return jo;
+
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java
index 195b4b4cd..bce3700e7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java
@@ -35,4 +35,11 @@ public interface BstIvtBoxinfoMapper extends BaseMapper<BstIvtBoxinfo> {
      * @return List<Map>
      */
     List<Map> getBoxIvtPage(@Param("query") Map query, @Param("pageQuery") Pageable pageQuery);
+
+    /**
+     * 查询木箱库存(手持)
+     * @param query 查询条件
+     * @return List<Map>
+     */
+    List<Map> getBoxIvtPda(@Param("query") JSONObject query);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml
index 29cc3262b..9f25239e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml
@@ -53,4 +53,45 @@
         </where>
 
     </select>
+
+    <select id="getBoxIvtPda" resultType="java.util.Map">
+        SELECT
+            box.box_no,
+            box.material_code,
+            box.material_name,
+            box.num,
+            box.box_length,
+            box.box_width,
+            box.box_high,
+            box.box_weight,
+            attr.struct_code,
+            (
+                CASE box.vehicle_type
+                WHEN '1' THEN '小托盘'
+                WHEN '2' THEN '大托盘'
+                END
+            ) AS vehicle_type
+        FROM
+            bst_ivt_boxinfo box
+            INNER JOIN st_ivt_structattr attr ON attr.storagevehicle_code = box.box_no
+        <where>
+            box.is_packing = '0'
+            AND attr.lock_type = '1'
+            AND attr.sect_code = 'BZC01'
+
+            <if test="query.material_code != null and query.material_code != ''">
+                AND box.material_code = #{query.material_code}
+            </if>
+
+            <if test="query.material_name != null and query.material_name != ''">
+                AND box.material_name LIKE '%${query.material_name}%'
+            </if>
+
+            <if test="query.box_no != null and query.box_no != ''">
+                AND box.box_no LIKE '%${query.box_no}%'
+            </if>
+
+        </where>
+
+    </select>
 </mapper>