From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/router/index.js | 6
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 3
north-glass-erp/northglass-erp/src/views/pp/report/YieldProcess.vue | 402 ++++++++++++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 70 +++++++
north-glass-erp/northglass-erp/src/lang/zh.js | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 7
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 7
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 10 +
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 3
10 files changed, 507 insertions(+), 4 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 7f7be78..f0e0160 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -320,7 +320,8 @@
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
- <td colspan="2">{{ itemTr.edging_type }}</td>
+ <td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" colspan="2">{{ itemTr.other_remarks }}</td>
+ <td v-else colspan="2">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="4">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 20f4b41..f877186 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -1068,6 +1068,7 @@
qualityReport:'鍝佽川鎶ヨ〃',
productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yieldReport:'鎴愬搧鐜囨姤琛�',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'宸ュ簭',
inventoryArea:'搴撳瓨闈㈢Н',
pleaseSelectADateFirst:'璇峰厛閫夋嫨鏃ユ湡',
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 3fdcb5d..b219f22 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -863,6 +863,12 @@
component: () => import('../views/pp/report/Yield.vue'),
},
{
+ //鎴愬搧鐜囨姤琛�
+ path: 'yieldProcess',
+ name: 'yieldProcess',
+ component: () => import('../views/pp/report/yieldProcess.vue'),
+ },
+ {
//娆＄牬鎶ヨ〃
path: 'damageReport',
name: 'damageReport',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
index a78fd55..d5c650f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
@@ -69,7 +69,12 @@
<el-menu-item index="/main/report/TaskCompletionStatus">{{$t('report.TaskCompletionStatus')}}</el-menu-item>
<el-menu-item index="/main/report/RawMaterialRequisition">{{$t('report.rawMaterialRequisition')}}</el-menu-item>
<el-menu-item index="/main/report/QualityReport">{{$t('report.qualityReport')}}</el-menu-item>
- <el-menu-item index="/main/report/Yield">{{$t('report.yieldReport')}}</el-menu-item>
+
+ <el-sub-menu index="4" popper-class="test">
+ <template #title>{{$t('report.yieldReport')}}</template>
+ <el-menu-item index="/main/report/Yield">{{$t('report.yieldReport')}}</el-menu-item>
+ <el-menu-item index="/main/report/YieldProcess">{{$t('report.yieldProcessReport')}}</el-menu-item>
+ </el-sub-menu>
<el-menu-item index="/main/report/ScheduleProductionSchedule">{{$t('report.productionScheduling')}}</el-menu-item>
<!-- <el-menu-item index="/main/report/OrderBOMOutside">BOM鎶ヨ〃</el-menu-item>-->
</el-menu>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/YieldProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/report/YieldProcess.vue
new file mode 100644
index 0000000..16ae2e7
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/YieldProcess.vue
@@ -0,0 +1,402 @@
+<script setup>
+
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import footSum from "@/hook/footSum"
+import dayjs from 'dayjs'
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let filterData = ref({})
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+//宸ュ簭
+const value = ref('纾ㄨ竟')
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const pad = (n) => n.toString().padStart(2, '0');
+
+ const formatDate = (date) => {
+ const year = date.getFullYear();
+ const month = pad(date.getMonth() + 1);
+ const day = pad(date.getDate());
+ return `${year}-${month}-${day} 08:00:00`;
+ };
+
+ const now = new Date();
+ const startDate = new Date(now.getTime() - 3600 * 1000 * 24 * 3); // 涓夊ぉ鍓�
+ const start = formatDate(startDate);
+ const end = formatDate(now);
+
+ return [start, end];
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+date.setDate(date.getDate() + 1);
+const pad = (n) => n.toString().padStart(2, '0');
+let year = date.getFullYear();
+let month = pad(date.getMonth() + 1);
+let day = pad(date.getDate());
+let newEndTime = `${year}-${month}-${day} 08:00:00`;
+let selectProcesses = value.value
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/yieldProcess/${startTime}/${newEndTime}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ titleSelectJson.value.processType = res.data.process
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = () => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+
+ request.post(`/report/yield/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+ gridOptions.loading = true
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+ // 濡傛灉鏃堕棿閮ㄥ垎鏄� 00:00锛屽垯璁剧疆涓� 08:00
+ if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {
+ rawStart.setHours(8, 0, 0, 0);
+ }
+ if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {
+ rawEnd.setHours(8, 0, 0, 0);
+ }
+
+ const startTime = formatDateTime(rawStart);
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+ form.date1 = [startTime, newEndTime];
+ let selectProcesses = value.value
+ request.post(`/report/yieldProcess/${startTime}/${newEndTime}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ // total.dataTotal = res.data.total.total*1
+ // total.pageTotal= res.data.total.pageTotal
+ // pageTotal.value = res.data.total
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+const formatDateTime = (date) => {
+ const year = date.getFullYear();
+ const month = pad(date.getMonth() + 1);
+ const day = pad(date.getDate());
+ const hour = pad(date.getHours());
+ const minute = pad(date.getMinutes());
+ return `${year}-${month}-${day} ${hour}:${minute}:00`;
+};
+
+//椤佃剼璺宠浆
+const handlePageChange = ({currentPage, pageSize}) => {
+ pageNum.value = currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+// const changeFilterEvent = (event, option, $panel,) => {
+// // 鎵嬪姩瑙﹀彂绛涢��
+// $panel.changeOption(event, !!option.data, option)
+// }
+
+// function filterChanged(column){
+// //gridOptions.loading=true
+// //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+// let value = column.datas[0]!=undefined?column.datas[0]:''
+// value = value.trim()
+// //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+// if (column.property.indexOf('.')>-1){
+// const columnArr = column.property.split('.')
+// filterData.value[columnArr[0]] = {
+// [columnArr[1]]:value
+// }
+// }else{
+// filterData.value[column.property] = value
+// }
+//
+// gridOptions.loading = true
+//
+// }
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
+const gridOptions = reactive({
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'Yield',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
+ },
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
+ },
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'process', title: t('report.workingProcedure'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'completedQuantity', title: t('reportingWorks.completedQuantity')},
+ {field: 'completedArea', title: t('reportingWorks.completedArea')},
+ {field: 'breakageQuantity', title: t('reportingWorks.quantityBroken')},
+ {field: 'breakageArea', title: t('reportingWorks.wornArea')},
+ {field: 'finished', title: t('report.finished')},
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ // buttons: [{
+ //
+ // }],
+ slots: {
+ tools: 'toolbar_buttons'
+ },
+ zoom: true,
+ custom: true
+ },
+ data: [],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ const List = ["completedQuantity",'completedArea','breakageQuantity','breakageArea']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
+function exportExcel(url, fileName,date) {
+ let processes = value.value
+
+ if(date===null){
+ ElMessage.warning(t('report.pleaseSelectADateFirst'))
+ return
+ }
+
+ if(processes===null){
+ ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
+ return
+ }
+
+ const date1 = new Date(date[0]);
+ const date2 = new Date(date[1]);
+ const timeDiff = Math.abs(date2.getTime() - date1.getTime());
+ const daysDiff = timeDiff / (1000 * 3600 * 24);
+ if(Math.floor(daysDiff)>180){
+ ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
+ return
+ }
+ let dataMp = ref({
+ date: date,
+ processes: processes,
+ })
+ request.post(url,dataMp.value,{responseType :'blob'}).then(res => {
+ const blob = new Blob([res])
+ if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
+ const elink = document.createElement('a')
+ elink.download = `${fileName}.xlsx`
+ elink.style.display = 'none'
+ elink.href = URL.createObjectURL(blob)
+ document.body.appendChild(elink)
+ elink.click()
+ URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
+ document.body.removeChild(elink)
+ } else { // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName)
+ }
+
+ })
+}
+</script>
+
+<template>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-date-picker
+ v-model="form.date1"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY/MM/DD HH:mm"
+ style="width: 350px"
+ type="daterange"
+ value-format="YYYY/MM/DD HH:mm"
+ />
+
+
+ <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
+
+ </div>
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
+
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportYield',
+ t('report.yieldReport'),
+ form.date1)">
+ {{t('basicData.export')}}</vxe-button>
+ </template>
+
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+
+
+ </vxe-grid>
+ </div>
+ </div>
+</template>
+
+<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 70e948a..290d85e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -125,6 +125,16 @@
}
+ @ApiOperation("鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�")
+ @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
+ public Result yieldProcess(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
+
+ }
+
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
@PostMapping("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index 6309163..6d56c23 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -126,6 +126,8 @@
List<Map<String, String>> processCardProgressReportMp(String orderId);
+ List<Map<String, String>> yieldProcessMp(String selectTime1, String selectTime2, Report report);
+
// Map<String, Integer> getWorkInProgressTotal(
// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index ba95b88..af20ff9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -1036,4 +1036,11 @@
return map;
}
+
+ public Map<String, Object> yieldProcessSv(String selectTime1, String selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.yieldProcessMp(selectTime1, selectTime2, report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 2716791..6e54c91 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2446,7 +2446,8 @@
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
- fc.technology_number as qrcode
+ fc.technology_number as qrcode,
+ o.other_remarks
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
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 cc3d8b4..d9b1819 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -799,7 +799,7 @@
SUM(t.breakageQuantity) as breakageQuantity,
SUM(t.breakageArea) as breakageArea,
t.responsibleTeam,
- CONCAT(ROUND(ROUND(t.area/(t.area + breakageArea),2)*100), '%') as finished,
+ CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished,
t.product_name
FROM
(
@@ -3206,4 +3206,72 @@
c.process_id
order by c.process_id, c.order_number, c.technology_number
</select>
+
+ <select id="yieldProcessMp">
+ SELECT
+
+ t.this_process as process,
+ SUM(t.completed_quantity) as completedQuantity,
+ SUM(t.area) as completedArea,
+ SUM(t.breakageQuantity) as breakageQuantity,
+ SUM(t.breakageArea) as breakageArea,
+ CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished
+
+ FROM
+ (
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ o.project,
+ o.batch,
+ rw.process_id,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
+ IFNULL(dd.breakage_quantity,0) as breakageQuantity,
+ IFNULL(ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * dd.breakage_quantity / 1000000, 2),0) AS breakageArea,
+ IFNULL(dd.responsible_team,'') as responsibleTeam,
+ od.product_name
+
+
+ FROM
+ reporting_work AS rw
+ LEFT JOIN reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN damage_details as dd on dd.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
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON ogd.order_id = fc.order_id
+ AND ogd.order_number = fc.order_number
+ AND ogd.technology_number = fc.technology_number
+ LEFT JOIN sd.order_detail AS od
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN sd.`order` AS o
+ ON o.order_id = od.order_id
+ WHERE
+ o.create_order > 0
+ AND rw.reviewed_state >= 0
+ AND rwd.completed_quantity + IFNULL(dd.breakage_quantity,0)> 0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+
+ ) t
+
+ GROUP BY
+ t.this_process
+ ORDER BY
+ t.this_process
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0