feat(wms): 新增实际库区/库位管理功能
- 新增实际库区/库位实体类WmsActualWarehouse及对应VO、BO类 - 新增实际库区/库位控制器WmsActualWarehouseController,支持增删改查及导出功能 - 新增实际库区/库位服务接口IWmsActualWarehouseService及实现类- 新增实际库区/库位Mapper接口及XML映射文件 - 在WmsMaterialCoil相关类中增加actualWarehouseId字段及相关联查询 - 更新物料钢卷查询逻辑,支持按实际库区筛选和显示实际库区名称
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user