From 8c2013d0aa30950aa901bc1cd2d97377bff66d0e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 25 Oct 2022 21:30:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=B4=A7=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/InvSpaceController.java          | 12 ++++++++++++
 .../api/admin/dao/business/InvSpaceDao.java    |  8 ++++++++
 .../api/admin/entity/business/InvSpace.java    |  2 +-
 .../admin/entity/inventory/InvCountOrder.java  |  2 +-
 .../service/inventory/InvSpaceService.java     |  2 ++
 .../inventory/impl/InvSpaceServiceImpl.java    |  9 ++++++++-
 .../mybatis/mapper/business/InvSpaceDao.xml    | 18 ++++++++++++++++--
 7 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java
index 7e28e227..39f54748 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java
@@ -90,4 +90,16 @@ public class InvSpaceController {
         return invSpaceService.updateSpace(invSpace);
     }
 
+    /**
+     * 查询货位的编码和名称列表，不分页
+     *
+     * @param filterInvSpaceRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/space/getSpaceCodeList")
+    public BaseResponse getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) {
+        List<InvSpace> list = invSpaceService.getSpaceCodeList(filterInvSpaceRequest);
+        return ResultVOUtils.success(list);
+    }
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java
index 88bc89cd..4c03e83f 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java
@@ -43,4 +43,12 @@ public interface InvSpaceDao {
      * @return
      */
     List<InvSpace> selectList(InvSpace invSpace);
+
+    /**
+     * 查询货位编码和名称
+     *
+     * @param filterInvSpaceRequest
+     * @return
+     */
+    List<InvSpace> selectSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest);
 }
\ No newline at end of file
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java
index 8d92054f..2024dcf8 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java
@@ -35,7 +35,7 @@ public class InvSpace {
     /**
     * 状态
     */
-    private Boolean status;
+    private Integer status;
 
     /**
     * 创建时间
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java
index b134f2b4..d829f59e 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java
@@ -60,7 +60,7 @@ public class InvCountOrder {
     /**
      * 状态
      */
-    private Boolean status;
+    private Integer status;
 
     /**
      * 备注字段
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java
index b2d22b9b..aa9d6545 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java
@@ -40,4 +40,6 @@ public interface InvSpaceService {
      * @return
      */
     BaseResponse updateSpace(InvSpace invSpace);
+
+    List<InvSpace> getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest);
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java
index c3596c34..748a404d 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java
@@ -49,7 +49,9 @@ public class InvSpaceServiceImpl implements InvSpaceService {
     @Override
     public BaseResponse addSpace(InvSpace invSpace) {
         BaseResponse PARAM_VERIFY_FALL = verifySpaceParams(invSpace);
-        if (PARAM_VERIFY_FALL != null) return PARAM_VERIFY_FALL;
+        if (PARAM_VERIFY_FALL.getCode() != 20000) {
+            return PARAM_VERIFY_FALL;
+        }
         String result = verifyExist(invSpace);
         if (!"success".equals(result)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, result);
@@ -111,6 +113,11 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         return ResultVOUtils.success();
     }
 
+    @Override
+    public List<InvSpace> getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) {
+        return invSpaceDao.selectSpaceCodeList(filterInvSpaceRequest);
+    }
+
     /**
      * 校验货位是否重复
      *
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml
index 61b28761..6f99f6d9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml
@@ -7,7 +7,7 @@
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="invStorageCode" jdbcType="VARCHAR" property="invStorageCode"/>
         <result column="invWarehouseCode" jdbcType="VARCHAR" property="invWarehouseCode"/>
-        <result column="status" jdbcType="BOOLEAN" property="status"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
         <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
@@ -351,7 +351,8 @@
     </select>
 
     <select id="selectList" resultMap="BaseResultMap">
-        select * from inv_space
+        select *
+        from inv_space
         <where>
             <if test="invStorageCode != null and invStorageCode != ''">
                 AND invStorageCode = #{invStorageCode}
@@ -368,4 +369,17 @@
         </where>
     </select>
 
+    <select id="selectSpaceCodeList" resultMap="BaseResultMap">
+        select code, name
+        from inv_space
+        <where>
+            <if test="invStorageCode != null and invStorageCode != ''">
+                AND invStorageCode = #{invStorageCode}
+            </if>
+            <if test="invWarehouseCode != null and invWarehouseCode != ''">
+                AND invWarehouseCode = #{invWarehouseCode}
+            </if>
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file