From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 9138b66..0f8b4bd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1365,8 +1365,8 @@
#{projectId},
#{glass.stockCode},
1,
- #{glass.width},
- #{glass.height},
+ #{glass.width}+#{glass.leftTrim}+#{glass.rightTrim},
+ #{glass.height}+#{glass.downTrim}+#{glass.upTrim},
#{glass.count},
#{glass.count},
1,
@@ -1878,8 +1878,8 @@
SELECT
width,
height,
- realwidth,
- realheight,
+ realwidth as realWidth,
+ realheight as realHeight,
stock_id AS stockId,
stock_code AS stockCode,
usage_rate AS usageRate,
@@ -1924,7 +1924,7 @@
FROM
pp.optimize_detail od
LEFT JOIN pp.flow_card fc on (od.process_id = fc.process_id and od.layer = fc.technology_number and od.order_sort = fc.order_number )
- LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number)
+ LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number AND ogd.technology_number = fc.technology_number)
LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
@@ -1980,11 +1980,9 @@
ou.use_count AS quantity,
ou.width,
ou.height,
- ou.width*ou.height*ou.use_count/1000000.0 as useArea,
- op.glass_total_area as totalArea
+ ou.width*ou.height*ou.use_count/1000000.0 as useArea
FROM
pp.optimize_use ou
- INNER JOIN pp.optimize_project op on ou.project_no = op.project_no
WHERE
ou.project_no = #{processId} and ou.state=1
</select>
@@ -2050,6 +2048,21 @@
from pp.optimize_use ou
left join mm.material_store ms on ou.raw_stock_code=ms.id where project_no=#{projectNumber} and state=1
</select>
+ <select id="getLayoutSetSv" resultType="java.util.Map">
+ SELECT
+ project_no,
+ stock_code as code,
+ realwidth AS width,
+ realheight AS height,
+ usage_rate as usageRate,
+ glass_count as polyQuantity,
+ glass_area AS polyArea
+
+ FROM
+ pp.optimize_layout
+ WHERE
+ project_no = #{processId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0