From 4135cb0f17ddb84af8ac907129bf6af3e83feec9 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 24 七月 2025 11:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 ecacbed..27ead9f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -128,6 +128,7 @@
<result column="examine_time" property="examineTime"/>
<result column="workProcessName" property="workProcessName"/>
<result column="device_name" property="deviceName"/>
+ <result column="order_type" property="orderType"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -172,17 +173,28 @@
c.technology_number,
b.child_width,
b.child_height,
- c.quantity,
+ if(c.technology_number=1,c.quantity,0) as quantity,
+# c.quantity,
+ c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
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,
+ c.quantity as glassQuantity,
+
+# 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,
+
+ if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
+ if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
+ if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0) as inventoryArea,
+ if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
+
+
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
- from flow_card as c
+ from pp.flow_card as c
left join
sd.order_detail as a
on c.order_id = a.order_id
@@ -1353,6 +1365,7 @@
rw.reviewed,
rw.examine_time,
rw.device_name,
+ o.order_type,
-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
--
Gitblit v1.8.0