From 19e06921635f43820c700463df8138a746e96591 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 16 十二月 2025 14:58:32 +0800
Subject: [PATCH] 补片流程卡添加是否合并打印配置，次破汇总报表添加平方毫米列
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/温州巨星.js | 1
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 4 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js | 1
north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java | 2 +
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 7 ++-
north-glass-erp/northglass-erp/src/stores/sd/companySet/上海北玻.js | 1
north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js | 1
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 1
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 1
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 12 ++++-
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 61 ++++++------------------------
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 3 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 3 +
14 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 03e1bee..b5b30be 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -92,6 +92,7 @@
//娴佺▼鍗�
request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
if (res.code == 200) {
+ console.log(res.data.data)
load(res.data.data)
} else {
ElMessage.warning(res.msg)
@@ -369,7 +370,8 @@
<td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" colspan="4">{{ itemTr.other_remarks }}</td>
<td v-else colspan="4">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="3">{{ itemTr.glass_child }}</td>
+ <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
+ <td v-else colspan="3" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
<td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 0467bcf..c8474ee 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -55,19 +55,7 @@
let name=company.companyName
let replenishQRCode=company.replenishQRCode
-//鍘婚櫎閲嶅瀵硅薄
-// let uniqueObjects = {};
-// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
-// data.value.printList.forEach(obj => {
-// // 鏋勫缓涓�涓敮涓�閿紝渚嬪 'NG24071502A001_1'
-// let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
-//
-// // 濡傛灉璇ラ敭涓嶅瓨鍦ㄤ簬 uniqueObjects 涓紝鍒欏皢璇ュ璞℃坊鍔犲埌 uniqueObjects 涓�
-// if (!uniqueObjects[key]) {
-// uniqueObjects[key] = obj;
-// }
-// });
-// data.value.printList = Object.values(uniqueObjects);
+
let flowCardCount = null
onMounted(() => {
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
@@ -95,43 +83,13 @@
});
produceList.value[j].detail[0].weight = sumWeight
}
- //澶勭悊鍚堝苟鎵撳嵃
- // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
- //
- // produceList.value.forEach(item => {
- // item.detail[0].technologyNumber = printMerge;
- // });
- //
- // //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
- // if (like == null) {
- // let process = produceList.value[0].detail[0].process
- // console.log(process)
- // let indexOfJiaJiao = process.indexOf('澶硅兌');
- // if (indexOfJiaJiao !== -1) {
- // // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
- // let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
- // produceList.value.forEach(item => {
- // item.detail[0].process = afterJiaJiao
- // })
- // }
- //
- // let indexOfProceList = produceList.value[0].processList
- // let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
- //
- // if (getProceList !== -1) {
- // // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
- // produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
- // }
- // }
- // }
-
produceList.value.forEach(item => {
let technologyNumberMerge = printMerge.split('').join(',');
item.detail[0].technologyNumberMerge = technologyNumberMerge
})
//澶勭悊缂栧彿鍒�
- //瀹氫箟瀛樻斁缂栧彿鏁扮粍
+ //瀹氫箟瀛樻斁缂栧彿鏁扮粍 澶╂触
const s01Values = [];
for (let i = 0; i < produceList.value.length; i++) {
const s01Values = [];
@@ -172,8 +130,10 @@
}, {});
// 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
- produceList.value = Object.values(mergedData);
+ if (company.printReplenishMerge){
+ produceList.value = Object.values(mergedData);
+ }
flowCardCount=produceList.value.length
handleSummary()
@@ -191,12 +151,15 @@
}
)
+const techNumberLength = ref()
+const qrcodeLength =ref()
const handleGetQRCode = async () => {
for (let i = 0; i < produceList.value.length; i++) {
const detailItem = produceList.value[i].detail[0];
const detailList = produceList.value[i].detailList;
const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();
+
const processId = detailItem.process_id;
detailItem.qrcodeList = [];
@@ -292,7 +255,7 @@
<span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
</div>
</td>
@@ -310,9 +273,11 @@
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
<td colspan="3">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="8">{{ itemTr.glass_child }}</td>
+ <td v-if="itemTr.qrcodeList.length*1>1" colspan="8">澶氬眰鍚堝苟锛岃鎯呰浜у搧鍚嶇О</td>
+ <td v-else colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
index bfb77bd..63eca5d 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
@@ -54,6 +54,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
index aac7b2c..b7c32da 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -53,6 +53,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index 9cb5376..eaafeec 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -53,6 +53,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index d91432e..acfefde 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -53,6 +53,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
index 4d43dde..c6f70aa 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
@@ -54,6 +54,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
index 44e1fbb..ed51673 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
@@ -55,6 +55,7 @@
soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"07:30",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:true,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:false,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index dd5c46f..ba75499 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -55,6 +55,7 @@
soleQRCode:true,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+ printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
//澶╂触
printLabel: {
custom: (item1) => {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
index f324be1..c3d5e09 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -340,8 +340,11 @@
filterMethod: filterChanged,
width:100
},
- {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",
- width:90},
+ {field: 'technology_number', title: t('processCard.technologyNumber'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, showOverflow: "ellipsis",
+ width:100},
{field: 'child_width', title: t('order.width'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
{field: 'child_height', title: t('order.height'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index c67cd3a..68e489c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -47,6 +47,7 @@
{field: 'childWidth', width: 100, title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'childHeight', width: 100, title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'thickness',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90, title: t('order.totalThickness')},
+ {field: 'pingfang', width: 90, title: t('report.thicknessArea')},
{field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken')},
{field: 'area', width: 120, title: t('reportingWorks.wornArea')},
{field: 'personnel', width: 120, title: t('reportingWorks.responsiblePersonnel')},
@@ -57,7 +58,7 @@
url :'/report/damageReport',
exportUrl :'/report/exportDamageReport',
exportName:t('report.secondaryBrokenTotal'),
- footList:['breakageQuantity','area']
+ footList:['breakageQuantity','area','pingfang']
})
</script>
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
index 56d3cee..fa6182f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
@@ -50,6 +50,8 @@
private Double childHeight;
@ExcelProperty("鍘氬害")
private String thickness;
+ @ExcelProperty("骞虫柟姣背")
+ private String pingfang;
@ExcelProperty("鎶ュ伐宸ュ簭")
private String thisProcess;
@ExcelProperty("鍒涘缓浜�")
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index ab83555..f43ff53 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -903,13 +903,16 @@
List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
//宸ュ簭鍒楄〃
List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+ itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
itemmap.put("processList", processList);
itemmap.put("processNameList", processNameList);
// itemmap.put("numberList", numberList);
list.add(itemmap);
}
+
}
+
map.put("data", list);
//鍒濆鍖栧��
printLike = null;
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 f169955..37cbad3 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -833,7 +833,9 @@
rw.this_process,
rw.creator,
rw.reporting_work_id,
- JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
+ ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -1441,7 +1443,9 @@
rw.this_process,
rw.creator,
rw.reporting_work_id,
- JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
+ ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
FROM sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
@@ -2721,7 +2725,9 @@
<select id="damageReportFootSum">
SELECT
SUM(dd.breakage_quantity) AS breakageQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area
+ ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area,
+ SUM(ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2)) AS pingfang
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
--
Gitblit v1.8.0