From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态，以及自定义标签打印
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 215ba9a..b314c4f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -203,7 +203,8 @@
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
- b.`group`
+ b.`group`,
+ c.termination_status
from pp.flow_card as c
left join
@@ -274,15 +275,16 @@
rw.this_process,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from
sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
left join pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
and dd.technology_number=ogd.technology_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state >-1
@@ -324,6 +326,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
@@ -346,15 +351,16 @@
rw.this_process,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from
sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
left join pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
and dd.technology_number=ogd.technology_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state >-1
@@ -396,6 +402,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
@@ -412,11 +421,12 @@
left join sd.order_glass_detail as ogd
on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
- and reviewed_state != 2
+ and rw.reviewed_state>=0
and rw.this_process != dd.responsible_process
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
@@ -451,6 +461,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
order by dd.id desc
</select>
@@ -465,8 +478,9 @@
left join sd.order_glass_detail as ogd
on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state != 2
@@ -760,7 +774,8 @@
ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -771,7 +786,7 @@
left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
+ AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
@@ -816,6 +831,9 @@
<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
and rw.creator regexp #{damageReportDTO.creator}
</if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{damageReportDTO.reportingWorkId}
+ </if>
GROUP BY
dd.id
limit #{offset},#{pageSize};
@@ -834,8 +852,8 @@
AND dd.technology_number = ogd.technology_number
WHERE
rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
- AND dd.available = 0
+ AND rw.reporting_work_time <= #{selectTime2}
+ AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -1209,7 +1227,8 @@
rw.this_process,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1245,7 +1264,8 @@
rw.this_process,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1286,7 +1306,8 @@
ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
FROM sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
@@ -2402,7 +2423,7 @@
AND od.order_number = ogd.order_number
WHERE
rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
+ AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
--
Gitblit v1.8.0