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

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-05-21 08:59:48 +08:00
parent 7b75940258 bb96f2a9e4
commit 10398f83b6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilReportVo.java
View File

@@ -24,4 +24,6 @@ public class WmsMaterialCoilReportVo {
// 班组
private String team;
// 创建时间
private String createTime;
}

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

@@ -481,7 +481,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.net_weight AS netWeight,
mc.warehouse_id AS warehouseId,
mc.quality_status AS qualityStatus,
mc.team AS team
mc.team AS team,
mc.create_time AS createTime
FROM wms_material_coil mc
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_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