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

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-08-15 09:41:48 +08:00
parent 99c93793b2 7665649567
commit 916d64c1ca
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java
View File

@@ -95,8 +95,17 @@ public class WmsSchedulePlanDetailVo {
* 天数 * 天数
*/ */
private Integer days; private Integer days;
//产线名字
/**
* 产线名字
*/
@ExcelProperty(value = "产线名字") @ExcelProperty(value = "产线名字")
private String lineName; private String lineName;
/**
* 批次号
*/
@ExcelProperty(value = "批次号")
private String batchNo;
} }

6
klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml
View File

@@ -38,9 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsSchedulePlanDetailVo"> <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsSchedulePlanDetailVo">
SELECT *, SELECT *,
wpl.line_name AS lineName wpl.line_name AS lineName,
wbt.batch_no AS batchNo
FROM wms_schedule_plan_detail wspd FROM wms_schedule_plan_detail wspd
left join wms_production_line wpl on wspd.line_id = wpl.line_id left join wms_production_line wpl on wspd.line_id = wpl.line_id
left join wms_batch wbt on wspd.batch_id = wbt.batch_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>