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

feat: 库存盘点联查名字

Browse Source
This commit is contained in:
JR
2025-08-01 17:04:32 +08:00
parent 0e50b769e9
commit d148bdbf92
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java
View File

@@ -80,5 +80,10 @@ public class WmsStockVo {
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
private String remark; private String remark;
/**
* 仓库/库区名称
*/
@ExcelProperty(value = "仓库/库区名称")
private String warehouseName;
} }

2
klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
View File

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockVo"> <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockVo">
SELECT SELECT
s.*, s.*,
w.warehouse_name,
CASE CASE
WHEN s.item_type = 'product' THEN p.product_name WHEN s.item_type = 'product' THEN p.product_name
WHEN s.item_type = 'raw_material' THEN r.raw_material_name WHEN s.item_type = 'raw_material' THEN r.raw_material_name
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM wms_stock s FROM wms_stock s
LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
left join wms_warehouse w on s.warehouse_id = w.warehouse_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>