From 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:26 +0800
Subject: [PATCH] 流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index d69806f..b554941 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -100,7 +100,7 @@
and ogd.glass_child regexp #{patchLog.glassChild}
</if>
<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
- and r.responsible_team regexp #{patchLog.responsibleTeam}
+ and r.responsible_team like concat('%', #{patchLog.responsibleTeam}, '%')
</if>
<if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
@@ -124,7 +124,7 @@
and r.patch_processes regexp #{patchLog.patchProcesses}
</if>
<if test="patchLog.reviewer != null and patchLog.reviewer != ''">
- and r.reviewer regexp #{patchLog.reviewer}
+ and r.reviewer like concat('%', #{patchLog.reviewer}, '%')
</if>
</where>
order by r.review_status,r.id desc
@@ -193,7 +193,7 @@
and ogd.glass_child regexp #{patchLog.glassChild}
</if>
<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
- and r.responsible_team regexp #{patchLog.responsibleTeam}
+ and r.responsible_team like concat('%', #{patchLog.responsibleTeam}, '%')
</if>
<if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
@@ -217,7 +217,7 @@
and r.patch_processes regexp #{patchLog.patchProcesses}
</if>
<if test="patchLog.reviewer != null and patchLog.reviewer != ''">
- and r.reviewer regexp #{patchLog.reviewer}
+ and r.reviewer like concat('%', #{patchLog.reviewer}, '%')
</if>
</where>
) as zu
@@ -309,7 +309,8 @@
rw.quality_inspector as qualityInspector,
ogd.glass_child as glassChild,
if(dd.responsible_process=rw.this_process,2,dd.quality_ins_status) as qualityInsStatus,
- if(dd.quality_ins_status=1,1,2) as orderBy
+ if(dd.quality_ins_status=1,1,2) as orderBy,
+ dd.responsible_personnel as responsiblePersonnel
from pp.damage_details dd
left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -367,7 +368,7 @@
and ogd.glass_child regexp #{patchLogAddDTO.glassChild}
</if>
<if test="patchLogAddDTO.responsibleTeam != null and patchLogAddDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{patchLogAddDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{patchLogAddDTO.responsibleTeam}, '%')
</if>
<if test="patchLogAddDTO.responsibleEquipment != null and patchLogAddDTO.responsibleEquipment != ''">
and dd.responsible_equipment regexp #{patchLogAddDTO.responsibleEquipment}
@@ -431,4 +432,46 @@
and project_no IS not NULL;
</select>
+ <select id="exportReplenishMp">
+ select
+ r.id,
+ r.review_status,
+ r.reporting_work_id,
+ r.patch_id,
+ r.process_id,
+ r.order_id,
+ r.order_sort,
+ o.project,
+ o.batch,
+ od.building_number,
+ od.product_name,
+ r.technology_number,
+ ogd.glass_address,
+ ogd.glass_child,
+ r.patch_num,
+ ogd.child_width as width,
+ ogd.child_height as height,
+ od.shape,
+ r.patch_type,
+ r.patch_reason,
+ r.responsible_team,
+ r.responsible_personnel,
+ r.responsible_equipment,
+ r.patch_area,
+ r.quality_inspector,
+ r.patch_processes,
+ r.reviewer,
+ r.create_time as create_time,
+ date(r.update_time) as update_time,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
+ from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
+ left join sd.`order` o on r.order_id = o.order_id
+ left join (select * from sd.order_glass_detail group by order_id,order_number,technology_number) as ogd
+ on r.order_id = ogd.order_id and r.order_sort = ogd.order_number and r.technology_number=ogd.technology_number
+ <where>
+ date(r.create_time)>=#{dates[0]} and date(r.create_time) <= #{dates[1]}
+ and o.create_order>0
+ </where>
+ order by r.review_status,r.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0