DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 新增实际库区/库位管理功能

Browse Source 
- 新增实际库区/库位实体类WmsActualWarehouse及对应VO、BO类
- 新增实际库区/库位控制器WmsActualWarehouseController，支持增删改查及导出功能
- 新增实际库区/库位服务接口IWmsActualWarehouseService及实现类- 新增实际库区/库位Mapper接口及XML映射文件
- 在WmsMaterialCoil相关类中增加actualWarehouseId字段及相关联查询
- 更新物料钢卷查询逻辑，支持按实际库区筛选和显示实际库区名称
This commit is contained in:
Joshi
2025-11-03 13:47:38 +08:00
parent f4df08972b
commit 4fa482525e
13 changed files with 510 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsActualWarehouseMapper">
<resultMap type="com.klp.domain.WmsActualWarehouse" id="WmsActualWarehouseResult">
<result property="actualWarehouseId" column="actual_warehouse_id"/>
<result property="actualParentId" column="actual_parent_id"/>
<result property="actualWarehouseCode" column="actual_warehouse_code"/>
<result property="actualWarehouseName" column="actual_warehouse_name"/>
<result property="actualWarehouseType" column="actual_warehouse_type"/>
<result property="sortNo" column="sort_no"/>
<result property="isEnabled" column="is_enabled"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>

7
klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
View File

@@ -80,14 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.status,
mc.remark,
mc.warehouse_id,
mc.actual_warehouse_id,
mc.del_flag,
mc.create_time,
mc.update_time,
mc.create_by,
mc.update_by,
w.warehouse_name AS warehouseName
w.warehouse_name AS warehouseName,
aw.actual_warehouse_name AS actualWarehouseName
FROM wms_material_coil mc
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
${ew.customSqlSegment}
</select>
<!-- 查询不同类型的钢卷在不同库区的分布情况 -->
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectVoListWithDynamicJoin" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
SELECT mc.*,
w.warehouse_name AS warehouseName,
aw.warehouse_name AS actualWarehouseName,
CASE
WHEN mc.item_type = 'row_material' THEN rm.raw_material_name
WHEN mc.item_type = 'product' THEN p.product_name
@@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN wms_raw_material rm ON mc.item_type = 'row_material' AND mc.item_id = rm.raw_material_id
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
${ew.customSqlSegment}
</select>