From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 80d492d..e24d899 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -121,6 +121,9 @@
<result column="area" property="area"/>
<result column="product_name" property="productName"/>
<result column="code" property="code"/>
+ <result column="reviewed" property="reviewed"/>
+ <result column="examine_time" property="examineTime"/>
+ <result column="workProcessName" property="workProcessName"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -168,6 +171,7 @@
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
+ c.quantity*a.area as gross_area,
ifnull(f.inventory, 0) as inventory,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
ifnull(dd.quantity, 0) as shippedQuantity,
@@ -868,7 +872,7 @@
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
where d.create_time >= #{selectTime1}
AND d.create_time < #{selectTime2}
- and o.create_order>0
+ and d.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -1326,7 +1330,10 @@
rwd.completed_quantity as completed_quantity,
ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
od.product_name,
- JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
--
Gitblit v1.8.0