From 6982cc225fad36090b8a348cd282463381c9d1dc Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 23 四月 2025 09:46:50 +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 | 2 +-
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
index 1c74781..0502060 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
@@ -63,6 +63,33 @@
quantity.value=props.project.quantity
}
+const fetchSettings = async (username) => {
+ try {
+ const response = await request.post(`/glassOptimize/selectOptimizeParms/${username}`);
+ if (response.code == 200) {
+ if (!response.data) {
+ console.error('鍝嶅簲鏁版嵁涓虹┖');
+ return;
+ }
+ const parsedData = JSON.parse(response.data);
+ if (parsedData.tempering) {
+ furnaceLength.value = parsedData.tempering.furnaceLength;
+ furnaceWidth.value = parsedData.tempering.furnaceWidth;
+ spacingWidth.value=parsedData.tempering.xAxisInterval;
+ spacingLong.value=parsedData.tempering.yAxisInterval;
+ heatingTime.value=parsedData.tempering.temperingTime;
+ }
+
+
+ } else {
+ console.error('璇锋眰澶辫触锛岀姸鎬佺爜:', response.code);
+ }
+ } catch (error) {
+ console.error('璇锋眰鍙戠敓閿欒:', error);
+ }
+};
+
+fetchSettings(username);
const gridOptions = reactive({
height: '100%',
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 44c091f..a1ed2a8 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -701,7 +701,7 @@
LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
AND ogd.order_number = od.order_number
LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
- AND fc.order_number
+ AND fc.order_number = od.order_number
AND fc.technology_number = ogd.technology_number
WHERE fc.order_id = #{orderId}
GROUP BY fc.id
--
Gitblit v1.8.0