From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 8c36f08..44c091f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -103,6 +103,8 @@
<result column="personnel" property="personnel"/>
<result column="glass_child" property="glassChild"/>
<result column="glassNumber" property="glassNumber"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
</resultMap>
<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
@@ -121,6 +123,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 +173,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,
@@ -570,6 +576,8 @@
round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
IFNULL(dd.responsible_personnel,'') as personnel,
ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
FROM
sd.ORDER AS o
@@ -1326,7 +1334,14 @@
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
+ CASE
+ WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX( ogd.glass_child )
+ END 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
@@ -2069,4 +2084,8 @@
rw.teams_groups_name
) as subquery
</select>
+
+ <select id="getLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{selectProcesses}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0