10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr

Browse Source
This commit is contained in:
郭飞 2025-04-29 11:52:26 +08:00
commit f6ecef45ab
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java
View File

@ -11,4 +11,6 @@ public class StorageAddDto {
private String storageName; private String storageName;
// 描述 // 描述
private String description; private String description;
//货位属性
private String storageUseType;
} }

2
zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java
View File

@ -11,4 +11,6 @@ public class StorageEditDto {
private String storageName; private String storageName;
// 描述 // 描述
private String description; private String description;
//货位属性
private String storageUseType;
} }

3
zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java
View File

@ -10,4 +10,7 @@ public class StoragePageDto {
// 货位描述 // 货位描述
private String description; private String description;
//货位属性
private String storageUseType;
} }

2
zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java
View File

@ -11,4 +11,6 @@ public class StorageSpec {
private String storageName; private String storageName;
// 描述 // 描述
private String description; private String description;
//货位属性
private String storageUseType;
} }

11
zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml
View File

@ -8,7 +8,7 @@
</update> </update>
<select id="page" resultType="com.cim.idm.model.po.storage.StorageSpec"> <select id="page" resultType="com.cim.idm.model.po.storage.StorageSpec">
select SITENAME, STORAGENAME, DESCRIPTION select SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE
from STORAGESPEC from STORAGESPEC
<where> <where>
<if test="dto.storageName != null and dto.storageName != ''"> <if test="dto.storageName != null and dto.storageName != ''">
@ -17,6 +17,9 @@
<if test="dto.description != null and dto.description != ''"> <if test="dto.description != null and dto.description != ''">
AND DESCRIPTION LIKE '%'||#{dto.description}||'%' AND DESCRIPTION LIKE '%'||#{dto.description}||'%'
</if> </if>
<if test="dto.storageUseType != null and dto.storageUseType != ''">
AND STORAGEUSETYPE = #{dto.storageUseType}
</if>
</where> </where>
</select> </select>
@ -28,12 +31,12 @@
</select> </select>
<insert id="add"> <insert id="add">
insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION) insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE)
values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description}) values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description}, #{storageSpec.storageUseType})
</insert> </insert>
<update id="editStorage"> <update id="editStorage">
update STORAGESPEC set DESCRIPTION = #{edit.description} update STORAGESPEC set DESCRIPTION = #{edit.description} ,STORAGEUSETYPE = #{edit.storageUseType}
where SITENAME = #{edit.siteName} where SITENAME = #{edit.siteName}
and STORAGENAME = #{edit.storageName} and STORAGENAME = #{edit.storageName}
</update> </update>