From 60a7c85895ae9e0b2d052736c2ecba542f246320 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 29 Apr 2025 09:13:20 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B4=A7=E4=BD=8D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=A2=9E=E5=8A=A0storageUseType(=E8=B4=A7=E4=BD=8D?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7)=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cim/idm/model/dto/storage/StorageAddDto.java  |  2 ++
 .../com/cim/idm/model/dto/storage/StorageEditDto.java |  2 ++
 .../com/cim/idm/model/dto/storage/StoragePageDto.java |  3 +++
 .../com/cim/idm/model/po/storage/StorageSpec.java     |  2 ++
 .../main/resources/com/cim/idm/dao/WareHouseDao.xml   | 11 +++++++----
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java
index 6caaf1b..7d80864 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java
@@ -11,4 +11,6 @@ public class StorageAddDto {
 	private String storageName;
 	// 描述
 	private String description;
+	//货位属性
+	private String storageUseType;
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java
index bf3b7cc..dba2e6b 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java
@@ -11,4 +11,6 @@ public class StorageEditDto {
 	private String storageName;
 	// 描述
 	private String description;
+	//货位属性
+	private String storageUseType;
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java
index d9ab040..bff88b0 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java
@@ -10,4 +10,7 @@ public class StoragePageDto {
 
 	// 货位描述
 	private String description;
+
+	//货位属性
+	private String storageUseType;
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java
index cf0fd4d..3c43508 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java
@@ -11,4 +11,6 @@ public class StorageSpec {
 	private String storageName;
 	// 描述
 	private String description;
+	//货位属性
+	private String storageUseType;
 }
diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml
index 2ec05b4..65d0035 100644
--- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml
+++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml
@@ -8,7 +8,7 @@
     </update>
 
     <select id="page" resultType="com.cim.idm.model.po.storage.StorageSpec">
-        select SITENAME, STORAGENAME, DESCRIPTION
+        select SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE
         from STORAGESPEC
         <where>
             <if test="dto.storageName != null and dto.storageName != ''">
@@ -17,6 +17,9 @@
             <if test="dto.description != null and dto.description != ''">
                 AND DESCRIPTION LIKE '%'||#{dto.description}||'%'
             </if>
+            <if test="dto.storageUseType != null and dto.storageUseType != ''">
+                AND STORAGEUSETYPE = #{dto.storageUseType}
+            </if>
         </where>
     </select>
 
@@ -28,12 +31,12 @@
     </select>
 
     <insert id="add">
-        insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION)
-        values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description})
+        insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE)
+        values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description}, #{storageSpec.storageUseType})
     </insert>
 
     <update id="editStorage">
-        update STORAGESPEC set DESCRIPTION = #{edit.description}
+        update STORAGESPEC set DESCRIPTION = #{edit.description} ,STORAGEUSETYPE = #{edit.storageUseType}
         where SITENAME = #{edit.siteName}
         and STORAGENAME = #{edit.storageName}
     </update>