refactor(aps): 重构排产单查询和导出功能
- 移除日期范围、产线ID和客户名称查询条件 - 修改排序规则为按业务序号升序排列 - 删除查询请求DTO中的废弃字段 - 优化Excel导出功能,添加标题动态显示和表头样式 - 实现前7列数据居中对齐和自动合并功能 - 修复POI依赖导入路径问题 - 更新转储订单项映射配置
This commit is contained in:
@@ -67,22 +67,10 @@
|
||||
FROM aps_plan_sheet s
|
||||
INNER JOIN aps_plan_detail d ON d.plan_sheet_id = s.plan_sheet_id AND d.del_flag = 0
|
||||
WHERE s.del_flag = 0
|
||||
<if test="startDate != null">
|
||||
AND d.start_time <![CDATA[>=]]> CONCAT(#{startDate}, ' 00:00:00')
|
||||
</if>
|
||||
<if test="endDate != null">
|
||||
AND d.start_time <![CDATA[<=]]> CONCAT(#{endDate}, ' 23:59:59')
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
AND s.line_id = #{lineId}
|
||||
</if>
|
||||
<if test="planSheetId != null">
|
||||
AND s.plan_sheet_id = #{planSheetId}
|
||||
</if>
|
||||
<if test="customerName != null and customerName != ''">
|
||||
AND d.customer_name LIKE CONCAT('%', #{customerName}, '%')
|
||||
</if>
|
||||
ORDER BY d.plan_detail_id DESC
|
||||
ORDER BY CAST(d.biz_seq_no AS UNSIGNED) ASC
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user