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

This commit is contained in:
2025-08-26 16:19:16 +08:00
7 changed files with 37 additions and 26 deletions

View File

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="detailId" column="detail_id"/>
<result property="planId" column="plan_id"/>
<result property="lineId" column="line_id"/>
<result property="batchId" column="batch_id"/>
<result property="taskId" column="task_id"/>
<result property="productId" column="product_id"/>
<result property="quantity" column="quantity"/>
<result property="startDate" column="start_date"/>
@@ -39,11 +39,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsSchedulePlanDetailVo">
SELECT *,
wpl.line_name AS lineName,
wbt.batch_no AS batchNo
wpt.plan_name AS planName,
wpt.plan_code AS planCode
FROM wms_schedule_plan_detail wspd
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
left join wms_production_task wpt on wspd.task_id = wpt.task_id
${ew.customSqlSegment}
</select>
<select id="selectVoListWithName" resultType="com.klp.domain.vo.WmsSchedulePlanDetailVo">
SELECT *,
wpl.line_name AS lineName,
wpt.plan_name AS planName,
wpt.plan_code AS planCode
FROM wms_schedule_plan_detail wspd
left join wms_production_line wpl on wspd.line_id = wpl.line_id
left join wms_production_task wpt on wspd.task_id = wpt.task_id
${ew.customSqlSegment}
</select>
</mapper>