From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 6
north-glass-erp/northglass-erp/src/lang/en.js | 9
north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js | 2
north-glass-erp/northglass-erp/src/lang/zh.js | 7
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 118 +++++
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 12
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 5
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 6
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutputSummary.vue | 609 +++++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/lang/ar.js | 9
north-glass-erp/northglass-erp/src/lang/ru.js | 9
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 397 +++++++++++++++++
north-glass-erp/northglass-erp/src/lang/kr.js | 9
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 19
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 37 +
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 32 +
north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java | 2
17 files changed, 1,236 insertions(+), 52 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 8962fe2..300f595 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -1132,7 +1132,9 @@
orderPlanDecomposition:'鬲賯乇賷乇 鬲賮氐賷賱賷 賱禺胤丞 丕賱胤賱亘',
damageReport:'鬲賯乇賷乇 丕賱丕爻鬲乇丕丨丞',
crossProcessBreaking:'鬲賯乇賷乇 鬲賮氐賷賱賷 賱賱毓賲賱賷丕鬲 丕賱賲鬲賯丕胤毓丞',
- teamOutput:'鬲賯乇賷乇 廿賳鬲丕噩 丕賱賮乇賷賯',
+ teamOutputReport:'鬲賯乇賷乇 廿賳鬲丕噩 丕賱賮乇賷賯',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetailsOutside:'鬲賯乇賷乇 鬲賮丕氐賷賱 丕賱乇賮賵賮',
taskCompletionStatus:'鬲賯乇賷乇 廿賳噩丕夭 丕賱賲賴丕賲',
rawMaterialRequisition:'鬲賯乇賷乇 丕禺鬲賷丕乇 丕賱夭噩丕噩 丕賱兀氐賱賷',
@@ -1154,7 +1156,10 @@
orderPlanDecomposition:'鬲賯乇賷乇 鬲賮氐賷賱賷 賱禺胤丞 丕賱胤賱亘',
secondaryBrokenReport:'鬲賯乇賷乇 丕賱丕爻鬲乇丕丨丞 ',
crossProcessBreakdown:'鬲賯乇賷乇 鬲賮氐賷賱賷 賱賱毓賲賱賷丕鬲 丕賱賲鬲賯丕胤毓丞',
- teamOutput:'鬲賯乇賷乇 廿賳鬲丕噩 丕賱賮乇賷賯',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetails:'鬲賯乇賷乇 鬲賮丕氐賷賱 丕賱乇賮賵賮',
TaskCompletionStatus:'鬲賯乇賷乇 廿賳噩丕夭 丕賱賲賴丕賲',
rawMaterialRequisition:'鬲賯乇賷乇 丕禺鬲賷丕乇 丕賱夭噩丕噩 丕賱兀氐賱賷',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 3762a1c..5a3bded 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -1132,7 +1132,9 @@
orderPlanDecomposition:'Flow card progress report',
damageReport:'Breakage statement',
crossProcessBreaking:'Cross process breakage report',
- teamOutput:'Team production report',
+ teamOutputReport:'Team production report',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetailsOutside:'Separate frame detail report',
taskCompletionStatus:'Task completion report',
rawMaterialRequisition:'Raw material requisition report',
@@ -1154,7 +1156,10 @@
orderPlanDecomposition:'Order plan breakdown report',
secondaryBrokenReport:' Breakage statement',
crossProcessBreakdown:'Cross process breakage report',
- teamOutput:'Team production report',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetails:'Separate frame detail report',
TaskCompletionStatus:'Task completion report',
rawMaterialRequisition:'Raw material requisition report',
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 7dc88c4..8e1f58f 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -1132,7 +1132,9 @@
orderPlanDecomposition:'欤茧 瓿勴殟 攵勳劃 氤搓碃靹�',
damageReport:'攵堧焿 韺岇啇 氤搓碃靹�',
crossProcessBreaking:'瓿奠爼 臧� 攵堧焿 氤搓碃靹�',
- teamOutput:'韺� 靸濎偘 氤搓碃靹�',
+ teamOutputReport:'韺� 靸濎偘 氤搓碃靹�',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetailsOutside:'靹犽皹 氤� 靸侅劯 氤搓碃靹�',
taskCompletionStatus:'鞛戩梾 鞕勲 順勴櫓 氤搓碃靹�',
rawMaterialRequisition:'鞗愴寪 於滉碃 氤搓碃靹�',
@@ -1154,7 +1156,10 @@
orderPlanDecomposition:'欤茧 瓿勴殟 攵勳劃 氤搓碃靹�',
secondaryBrokenReport:'攵堧焿 韺岇啇 氤搓碃靹�',
crossProcessBreakdown:'瓿奠爼 臧� 攵堧焿 氤搓碃靹�',
- teamOutput:'韺� 靸濎偘 氤搓碃靹�',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetails:'頂勲爤鞛勲硠 靸侅劯 氤搓碃靹�',
TaskCompletionStatus:'鞛戩梾 鞕勲 順勴櫓 氤搓碃靹�',
rawMaterialRequisition:'鞗愴寪 於滉碃 氤搓碃靹�',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 1fbea73..c0fa0f6 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -1132,7 +1132,9 @@
orderPlanDecomposition:'袨褌褔械褌 芯 褉邪蟹谢芯卸械薪懈懈 锌谢邪薪邪 蟹邪泻邪蟹邪',
damageReport:'袨褌褔械褌 芯 锌芯胁褉械卸写械薪懈褟褏',
crossProcessBreaking:'袨褌褔械褌 芯 屑械卸芯锌械褉邪褑懈芯薪薪褘褏 锌芯胁褉械卸写械薪懈褟褏',
- teamOutput:'袨褌褔械褌 芯 胁褘锌褍褋泻械 斜褉懈谐邪写',
+ teamOutputReport:'袨褌褔械褌 芯 胁褘锌褍褋泻械 斜褉懈谐邪写',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetailsOutside:'袩芯写褉芯斜薪邪褟 胁械写芯屑芯褋褌褜 褉邪褋锌褉械写械谢懈褌械谢褜薪芯泄 褉邪屑褘',
taskCompletionStatus:'袙械写芯屑芯褋褌褜 胁褘锌芯谢薪械薪懈褟 屑邪薪写邪褌邪',
rawMaterialRequisition:'袨褌褔械褌 芯 锌芯谢褍褔械薪懈懈 芯褉懈谐懈薪邪谢褜薪芯谐芯 褋褌械泻谢邪',
@@ -1154,7 +1156,10 @@
orderPlanDecomposition:'袨褌褔械褌 芯 褉邪蟹谢芯卸械薪懈懈 锌谢邪薪邪 蟹邪泻邪蟹邪',
secondaryBrokenReport:'袨褌褔械褌 芯 锌芯胁褉械卸写械薪懈褟褏',
crossProcessBreakdown:'袨褌褔械褌 芯 屑械卸芯锌械褉邪褑懈芯薪薪褘褏 锌芯胁褉械卸写械薪懈褟褏',
- teamOutput:'袨褌褔械褌 芯 胁褘锌褍褋泻械 斜褉懈谐邪写',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetails:'袩芯写褉芯斜薪邪褟 胁械写芯屑芯褋褌褜 褉邪褋锌褉械写械谢懈褌械谢褜薪芯泄 褉邪屑褘',
TaskCompletionStatus:'袙械写芯屑芯褋褌褜 胁褘锌芯谢薪械薪懈褟 屑邪薪写邪褌邪',
rawMaterialRequisition:'袨褌褔械褌 芯 锌芯谢褍褔械薪懈懈 芯褉懈谐懈薪邪谢褜薪芯谐芯 褋褌械泻谢邪',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 0b74fd1..6450a73 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -1133,7 +1133,9 @@
orderPlanDecomposition:'璁㈠崟璁″垝鍒嗚В鎶ヨ〃',
damageReport:'娆＄牬鎶ヨ〃',
crossProcessBreaking:'璺ㄥ伐搴忔鐮存姤琛�',
- teamOutput:'鐝粍浜ч噺鎶ヨ〃',
+ teamOutputReport:'鐝粍浜ч噺鎶ヨ〃',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetailsOutside:'鍒嗘灦鏄庣粏鎶ヨ〃',
taskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
rawMaterialRequisition:'鍘熺墖棰嗘枡鎶ヨ〃',
@@ -1157,7 +1159,8 @@
crossProcessBreakdown:'璺ㄥ伐搴忔鐮存姤琛�',
notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
- teamOutput:'鐝粍浜ч噺鎶ヨ〃',
+ teamOutput:'鐝粍浜ч噺鏄庣粏鎶ヨ〃',
+ teamOutputSummary:'鐝粍浜ч噺姹囨�绘姤琛�',
splittingDetails:'鍒嗘灦鏄庣粏鎶ヨ〃',
TaskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
rawMaterialRequisition:'鍘熺墖棰嗘枡鎶ヨ〃',
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index acf964b..641ba6b 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -880,6 +880,12 @@
component: () => import('../views/pp/report/TeamOutput.vue'),
},
{
+ //鐝粍浜ч噺姹囨��
+ path: 'teamOutputSummary',
+ name: 'teamOutputSummary',
+ component: () => import('../views/pp/report/TeamOutputSummary.vue'),
+ },
+ {
//鍦ㄥ埗鍝佹姤琛�
path: 'workInProgress',
name: 'workInProgress',
diff --git a/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js b/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
index 8cc7001..91ca68b 100644
--- a/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
+++ b/north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
@@ -14,6 +14,7 @@
reportingWorkDate:ref(["",""]),
qualityInspectionDate:ref(["",""]),
brokenDate:ref(["",""]),
+ teamOutputDate:ref(["",""]),
yieldDate:ref(["",""]),
replenishDate:ref(["",""]),
searchOrderListFilter:ref([]),//璁㈠崟棣栭〉绛涢�塢
@@ -90,6 +91,7 @@
this.reportingWorkDate=["",""]
this.qualityInspectionDate=["",""]
this.brokenDate=["",""]
+ this.teamOutputDate=["",""]
this.yieldDate=["",""]
this.replenishDate=["",""]
this.searchOrderFilter={
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 40c3b3d..cdcf8b7 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
@@ -56,18 +56,18 @@
<el-menu-item index="/main/report/OrderPlanDecomposition">{{$t('report.orderPlanDecomposition')}}</el-menu-item>
<el-menu-item index="/main/report/OrderReportingWorks">{{$t('report.page.orderWorkReportForm')}}</el-menu-item>
</el-sub-menu>
-<!-- <el-sub-menu index="2" popper-class="test">-->
-<!-- <template #title>浜ч噺鎶ヨ〃</template>-->
-<!-- <el-menu-item index="/main/report/TeamOutput">鐝粍浜ч噺</el-menu-item>-->
-<!-- <el-menu-item index="/main/report/EquipmentOutput">璁惧浜ч噺</el-menu-item>-->
-<!-- </el-sub-menu>-->
<el-sub-menu index="3" popper-class="test">
<template #title>{{$t('report.secondaryBrokenReport')}}</template>
<el-menu-item index="/main/report/DamageReport">{{$t('report.secondaryBrokenTotal')}}</el-menu-item>
<el-menu-item index="/main/report/CrossProcessBreaking">{{$t('report.crossProcessBreakdown')}}</el-menu-item>
<el-menu-item index="/main/report/NotCrossProcessBreaking">{{$t('report.notCrossProcessBreakdown')}}</el-menu-item>
</el-sub-menu>
- <el-menu-item index="/main/report/TeamOutput">{{$t('report.teamOutput')}}</el-menu-item>
+ <el-sub-menu index="5" popper-class="test">
+ <template #title>{{$t('report.page.teamOutputReport')}}</template>
+ <el-menu-item index="/main/report/TeamOutputSummary">{{$t('report.teamOutputSummary')}}</el-menu-item>
+ <el-menu-item index="/main/report/TeamOutput">{{$t('report.teamOutput')}}</el-menu-item>
+ </el-sub-menu>
+
<el-menu-item index="/main/report/SplittingDetailsOutside">{{$t('report.splittingDetails')}}</el-menu-item>
<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>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 4f3bb9b..72c9618 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -10,6 +10,7 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove"
import {VxeUI} from "vxe-pc-ui";
import companyInfo from "@/stores/sd/companyInfo";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -21,6 +22,9 @@
orderId: '',
project: ''
})
+
+const reportTime=company.reportTime
+const orderInfo = useOrderInfoStore()
//宸ュ簭
const procseeValue = ref()
@@ -117,13 +121,15 @@
let day = pad(date.getDate());
let newEndTime = `${year}-${month}-${day} ${times}`;
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+
+request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
total.value = res.data.footSum
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
+ orderInfo.teamOutputDate = res.data.selectDate
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process
produceList.forEach(item => {
@@ -168,10 +174,11 @@
const newEndTime = formatDateTime(endPlusOne);
const selectProcesses = procseeValue.value;
form.date1 = [startTime, newEndTime];
- request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+ request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
total.value = res.data.footSum
+ orderInfo.teamOutputDate = res.data.selectDate
produceList = deepClone(res.data.data)
produceList.forEach(item => {
item.mmTotal = sumMmValues(item.workProcessName);
@@ -239,14 +246,14 @@
form.date1 = [startTime, newEndTime];
- request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value)
+ request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value)
.then((res) => {
if (res.code == 200) {
total.value = res.data.footSum;
total.dataTotal = res.data.total.total * 1;
total.pageTotal = res.data.total.pageTotal;
pageTotal.value = res.data.total;
-
+ orderInfo.teamOutputDate = res.data.selectDate
produceList = res.data.data;
produceList.forEach(item => {
item.mmTotal = sumMmValues(item.workProcessName);
@@ -329,12 +336,13 @@
endPlusOne.setDate(endPlusOne.getDate());
const newEndTime = formatDateTime(endPlusOne);
form.date1 = [startTime, newEndTime];
- request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+ request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ orderInfo.teamOutputDate = res.data.selectDate
total.value = res.data.footSum
produceList = deepClone(res.data.data)
produceList.forEach(item => {
@@ -519,15 +527,14 @@
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
- <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-date-picker
+ v-model="orderInfo.teamOutputDate"
+ type="daterange"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY/MM/DD HH:mm"
+ value-format="YYYY-MM-DD HH:mm"
+ />
<el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
<el-option
@@ -592,7 +599,7 @@
<vxe-button style="margin-right: 0.5rem"
@click="exportExcel('/report/exportTeamOutput',
t('report.teamOutput'),
- form.date1)">
+ orderInfo.teamOutputDate)">
{{t('basicData.export')}}</vxe-button>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutputSummary.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutputSummary.vue
new file mode 100644
index 0000000..796278e
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutputSummary.vue
@@ -0,0 +1,609 @@
+<script setup>
+
+import {onMounted, 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 footSum from "@/hook/footSum"
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove"
+import {VxeUI} from "vxe-pc-ui";
+import companyInfo from "@/stores/sd/companyInfo";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let filterData = ref({})
+const company = companyInfo()
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+const reportTime=company.reportTime
+const orderInfo = useOrderInfoStore()
+
+//宸ュ簭
+const procseeValue = 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 getDaysBetween(startTime, endTime, includeEnd = false) {
+ const start = new Date(startTime)
+ const end = new Date(endTime)
+
+ // 杞负鏃堕棿鎴宠绠楀樊鍊�
+ const diffMs = end.setHours(0, 0, 0, 0) - start.setHours(0, 0, 0, 0)
+ const diffDays = diffMs / (1000 * 60 * 60 * 24)
+
+ // 杩斿洖鏁存暟澶╂暟
+ return includeEnd ? diffDays + 1 : diffDays
+}
+
+const times=company.reportTime
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+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} ${times}`;
+ };
+
+ 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];
+}
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+
+})
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let selectProcesses = procseeValue.value
+
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+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} ${times}`;
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/TeamOutputSummary/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ total.value = res.data.footSum
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageTotal.value = res.data.total
+ orderInfo.teamOutputDate = res.data.selectDate
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ titleSelectJson.value.processType = res.data.process
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ gridOptions.loading = false
+ ElMessage.warning(res.msg)
+ }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = () => {
+ gridOptions.loading = true
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
+
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 0, 0);
+ }
+ const startTime = formatDateTime(rawStart);
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+ const selectProcesses = procseeValue.value;
+ form.date1 = [startTime, newEndTime];
+ request.post(`/report/TeamOutputSummary/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+
+ total.value = res.data.footSum
+ orderInfo.teamOutputDate = res.data.selectDate
+ produceList = deepClone(res.data.data)
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ gridOptions.loading = false
+ 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 getWorkOrder = () => {
+ gridOptions.loading = true;
+
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
+
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 0, 0);
+ }
+
+ // 鏍煎紡鍖�
+ const startTime = formatDateTime(rawStart);
+
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+
+ const selectProcesses = procseeValue.value;
+
+ const timeDifference = getDaysBetween(startTime, newEndTime);
+ if (timeDifference > 180) {
+ ElMessage.warning(t('report.theTimeLimitCannotExceed180Days'));
+ gridOptions.loading = false;
+ return;
+ }
+
+ form.date1 = [startTime, newEndTime];
+
+ request.post(`/report/TeamOutputSummary/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value)
+ .then((res) => {
+ if (res.code == 200) {
+ total.value = res.data.footSum;
+ orderInfo.teamOutputDate = res.data.selectDate
+ total.dataTotal = res.data.total.total * 1;
+ total.pageTotal = res.data.total.pageTotal;
+ pageTotal.value = res.data.total;
+
+ produceList = res.data.data;
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+
+ xGrid.value.loadData(produceList);
+ gridOptions.loading = false;
+ } else {
+ gridOptions.loading = false
+ ElMessage.warning(res.msg);
+ }
+ });
+}
+
+ const sumMmValues = (workProcessName) => {
+ if (!workProcessName) return 0;
+
+ return workProcessName
+ .split('+') // 鎷嗗垎姣忎釜閮ㄥ垎
+ .map(part => {
+ const match = part.match(/^(\d+)(?=mm)/); // 鎻愬彇 mm 鍓嶉潰鐨勬暟瀛�
+ return match ? parseInt(match[1], 10) : 0;
+ })
+ .reduce((sum, num) => sum + num, 0); // 姹傚拰
+}
+//椤佃剼璺宠浆
+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 selectProcesses = procseeValue.value
+ //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
+ }
+
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
+
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 0, 0);
+ }
+ const startTime = formatDateTime(rawStart);
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+ form.date1 = [startTime, newEndTime];
+ request.post(`/report/TeamOutputSummary/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal=parseInt(res.data.total)
+ orderInfo.teamOutputDate = res.data.selectDate
+ pageNum.value=1
+ total.value = res.data.footSum
+ produceList = deepClone(res.data.data)
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+ xGrid.value.loadData(produceList)
+
+ gridOptions.loading=false
+ } else {
+ gridOptions.loading = false
+ ElMessage.warning(res.msg)
+ }
+ })
+
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
+const gridOptions = reactive({
+ loading: true,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'TeamOutput',
+ 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: 'thisProcess',
+ title: t('reportingWorks.reportingProcess'),
+ showOverflow: "ellipsis",
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }
+ },
+ {
+ field: 'teamsGroupsName', title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
+ },
+
+ {field: 'workProcessName', title: t('report.workProcessName'),
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'completedQuantity', title: t('reportingWorks.completedQuantity')},
+ {field: 'area', title: t('reportingWorks.completedArea')},
+
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ // buttons: [{
+ //
+ // }],
+ slots: {
+ tools: 'toolbar_buttons'
+ },
+ // import: false,
+ // export: true,
+ // print: true,
+ 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",'area','thicknessArea']
+ if (List.includes(column.field)) {
+ //return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
+function exportExcel(url, fileName,date) {
+ gridOptions.loading = true
+ let processes = procseeValue.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)
+ gridOptions.loading = false
+ } else { // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName)
+ }
+
+ })
+}
+
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+ VxeUI.clipboard.copy(row[column.property])
+}
+</script>
+
+<template>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
+ <!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
+
+ <el-date-picker
+ v-model="orderInfo.teamOutputDate"
+ type="daterange"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY/MM/DD HH:mm"
+ value-format="YYYY-MM-DD HH:mm"
+ />
+
+ <el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
+ <el-option
+ :label="t('report.allProcess')"
+ :value="'all'"
+ />
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.basic_name"
+ :value="item.basic_name"
+ />
+ </el-select>
+ <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"
+ @filter-change="filterChanged"
+ @cell-dblclick="handleCellDblClick"
+
+ >
+ <!-- @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 #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ :total="total.dataTotal"
+ @page-change="handlePageChange"
+ >
+ </vxe-pager>
+ </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>
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportTeamOutputSummary',
+ t('report.teamOutputSummary'),
+ orderInfo.teamOutputDate)">
+ {{t('basicData.export')}}</vxe-button>
+ </template>
+
+ </vxe-grid>
+ </div>
+ </div>
+</template>
+
+<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+</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 ba60fca..498cf09 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
@@ -199,16 +199,29 @@
return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
}
+ @ApiOperation("鐝粍浜ч噺姹囨�绘姤琛�")
+ @PostMapping("/TeamOutputSummary/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
+ public Result TeamOutputSummary(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
+ @PathVariable String selectProcesses,
+ @RequestBody TeamOutputDTO teamOutputDTO) {
+ return Result.success(reportService.TeamOutputSummarySv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
+
+ }
+
@ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
- @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
+ @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
public Result teamOutput(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@PathVariable String selectProcesses,
@RequestBody TeamOutputDTO teamOutputDTO) {
- return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
}
@ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
@@ -320,7 +333,7 @@
DownExcel.download(response, ScheduleProductionScheduleDTO.class, reportService.exportScheduleReportSv(dates), "ScheduleProduction");
}
- @ApiOperation("鐝粍浜ч噺瀵煎嚭")
+ @ApiOperation("鐝粍浜ч噺鏄庣粏瀵煎嚭")
@PostMapping("/exportTeamOutput")
public void exportTeamOutput(HttpServletResponse response,
@RequestBody Map<String, Object> dates
@@ -329,6 +342,15 @@
DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
}
+ @ApiOperation("鐝粍浜ч噺姹囨�诲鍑�")
+ @PostMapping("/exportTeamOutputSummary")
+ public void exportTeamOutputSummary(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates
+ ) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSummarySv(dates), "TeamOutput");
+ }
+
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
@PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}/{terminationVal}")
public Result workInProgressCombination(
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 9175bfb..cb2eb6c 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
@@ -135,6 +135,11 @@
List<Map<String, String>> selectProcessCompletedMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String laminating, Report report);
+ List<TeamOutputDTO> TeamOutputSummaryMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);
+
+ Map<String, Integer> teamOutputSummaryPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);
+
+ List<TeamOutputDTO> exportTeamOutputSummaryMp(List<LocalDate> date, String selectProcesses, String laminating);
// Map<String, Integer> getWorkInProgressTotal(
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
index f201570..cdda14e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
@@ -48,4 +48,6 @@
@Param("orderDetail") OrderDetail orderDetail);
List<Map<String,Object>> getProjectList(Long id);
+
+ Integer countByCustomerName(@Param("customer") Customer customer);
}
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 a20f900..ad0c82b 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
@@ -1124,30 +1124,44 @@
// }
public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize,
- String selectTime1, String selectTime2,
+ List<String> selectDate,
+ String reportTime,
String selectProcesses, TeamOutputDTO teamOutputDTO) {
if ("all".equals(selectProcesses)) {
selectProcesses = "";
}
+// 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(15).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = toReportTime(selectDate.get(0), reportTime);
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = toReportTime(selectDate.get(1), reportTime);
+ }
+ }
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> result = new HashMap<>();
String laminating = reportMapper.getLaminating(selectProcesses);
-
+ String finalStartDate = startDate;
+ String finalEndDate = endDate;
String finalSelectProcesses = selectProcesses;
CompletableFuture<List<TeamOutputDTO>> dataFuture = asyncExecutor.runAsync(() ->
- reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2, finalSelectProcesses, laminating, teamOutputDTO));
+ reportMapper.teamOutputMp(offset, pageSize, finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
CompletableFuture<List<Map<String, String>>> processFuture = asyncExecutor.runAsync(() ->
productionSchedulingMapper.selectProcess());
CompletableFuture<Map<String, Integer>> totalFuture = asyncExecutor.runAsync(() ->
- reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2, finalSelectProcesses, laminating, teamOutputDTO));
+ reportMapper.teamOutputPageTotal(offset, pageSize, finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
CompletableFuture<Map<String, Float>> footSumFuture = asyncExecutor.runAsync(() ->
- reportMapper.teamOutputFootSum(selectTime1, selectTime2, finalSelectProcesses, laminating, teamOutputDTO));
+ reportMapper.teamOutputFootSum(finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
// 绛夊緟鎵�鏈変换鍔″畬鎴�
CompletableFuture.allOf(dataFuture, processFuture, totalFuture, footSumFuture).join();
@@ -1161,7 +1175,10 @@
e.printStackTrace();
throw new RuntimeException("骞惰鏌ヨ寮傚父锛�" + e.getMessage(), e);
}
-
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ result.put("selectDate", list);
return result;
}
@@ -1188,6 +1205,34 @@
}
String laminating = reportMapper.getLaminating(process);
List<TeamOutputDTO> list = reportMapper.exportTeamOutputMp(date, process, laminating);
+
+ // 娓呮礂姣忎釜 TeamOutputDTO 瀹炰緥鐨� String 瀛楁锛堝幓闄ゅ墠鍚庣┖鏍硷級
+ for (TeamOutputDTO dto : list) {
+ for (Field field : dto.getClass().getDeclaredFields()) {
+ field.setAccessible(true);
+ try {
+ Object value = field.get(dto);
+ if (value instanceof String) {
+ String trimmed = ((String) value).trim();
+ field.set(dto, trimmed);
+ }
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ return list;
+ }
+
+ public List exportTeamOutputSummarySv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ String process= (String) dates.get("processes");
+ if (process.equals("all")){
+ process="";
+ }
+ String laminating = reportMapper.getLaminating(process);
+ List<TeamOutputDTO> list = reportMapper.exportTeamOutputSummaryMp(date, process, laminating);
// 娓呮礂姣忎釜 TeamOutputDTO 瀹炰緥鐨� String 瀛楁锛堝幓闄ゅ墠鍚庣┖鏍硷級
for (TeamOutputDTO dto : list) {
@@ -1752,4 +1797,65 @@
return map;
}
+
+ public Map<String, Object> TeamOutputSummarySv(Integer pageNum, Integer pageSize, List<String> selectDate,
+ String reportTime, String selectProcesses, TeamOutputDTO teamOutputDTO) {
+ if ("all".equals(selectProcesses)) {
+ selectProcesses = "";
+ }
+
+ Integer offset = (pageNum - 1) * pageSize;
+
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(15).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = toReportTime(selectDate.get(0), reportTime);
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = toReportTime(selectDate.get(1), reportTime);
+ }
+ }
+ Map<String, Object> result = new HashMap<>();
+
+ String laminating = reportMapper.getLaminating(selectProcesses);
+
+ String finalSelectProcesses = selectProcesses;
+ String finalStartDate = startDate;
+ String finalEndDate = endDate;
+ CompletableFuture<List<TeamOutputDTO>> dataFuture = asyncExecutor.runAsync(() ->
+ reportMapper.TeamOutputSummaryMp(offset, pageSize, finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
+
+ CompletableFuture<List<Map<String, String>>> processFuture = asyncExecutor.runAsync(() ->
+ productionSchedulingMapper.selectProcess());
+
+ CompletableFuture<Map<String, Integer>> totalFuture = asyncExecutor.runAsync(() ->
+ reportMapper.teamOutputSummaryPageTotal(offset, pageSize, finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
+
+
+
+ CompletableFuture<Map<String, Float>> footSumFuture = asyncExecutor.runAsync(() ->
+ reportMapper.teamOutputFootSum(finalStartDate, finalEndDate, finalSelectProcesses, laminating, teamOutputDTO));
+
+ // 绛夊緟鎵�鏈変换鍔″畬鎴�
+ CompletableFuture.allOf(dataFuture, processFuture, totalFuture, footSumFuture).join();
+
+ try {
+ result.put("data", dataFuture.get());
+ result.put("process", processFuture.get());
+ result.put("total", totalFuture.get());
+ result.put("footSum", footSumFuture.get());
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("骞惰鏌ヨ寮傚父锛�" + e.getMessage(), e);
+ }
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ result.put("selectDate", list);
+ return result;
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index 6589b2a..e751c03 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -55,14 +55,19 @@
try {
Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
if(customer!=null){
- if (customer.getId()!=null && customer.getId()!=0){
- customerMapper.updateCustomer(customer);
- log.setFunction("insertCustomer淇敼");
- }else{
- customerMapper.insertCustomer(customer);
- log.setFunction("insertCustomer鏂板");
+ Integer count = customerMapper.countByCustomerName(customer);
+ if (count > 0) {
+ saveState = false;
+ }else {
+ if (customer.getId()!=null && customer.getId()!=0){
+ customerMapper.updateCustomer(customer);
+ log.setFunction("insertCustomer淇敼");
+ }else{
+ customerMapper.insertCustomer(customer);
+ log.setFunction("insertCustomer鏂板");
+ }
+ logService.saveLog(log);
}
- logService.saveLog(log);
}
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
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 3fac30d..0494867 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1844,7 +1844,7 @@
AND rw.reviewed_state >= 0
AND rwd.completed_quantity > 0
AND rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
+ AND rw.reporting_work_time <= #{selectTime2}
<choose>
<!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
<when test="selectProcesses != null and selectProcesses != ''">
@@ -1906,7 +1906,7 @@
) t
WHERE 1 = 1
<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
- AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
+ and t.workProcessName like concat('%', #{teamOutputDTO.workProcessName}, '%')
</if>
HAVING 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
@@ -1991,7 +1991,7 @@
AND rw.reviewed_state >= 0
AND rwd.completed_quantity > 0
AND rw.reporting_work_time >= #{date[0]}
- AND rw.reporting_work_time < #{date[1]}
+ AND rw.reporting_work_time <= #{date[1]}
<choose>
<!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
<when test="process != null and process != ''">
@@ -4009,4 +4009,395 @@
GROUP BY
t.this_process
</select>
+
+ <select id="TeamOutputSummaryMp">
+ SELECT
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName,
+
+ -- 鏁伴噺姹囨��
+ SUM(t.completed_quantity) AS completed_quantity,
+
+ -- 闈㈢Н姹囨��
+ ROUND(SUM(t.area), 2) AS area
+ FROM
+ (
+ /* ================= 鍐呭眰瀛愭煡璇紙淇濇寔涓嶅彉锛� ================= */
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ o.order_id,
+ rw.process_id,
+ fc.order_number,
+ MAX(ogd.child_width) AS width,
+ MAX(ogd.child_height) AS height,
+ od.edging_type,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(
+ MAX(ogd.child_width) * MAX(ogd.child_height)
+ * rwd.completed_quantity / 1000000,
+ 2
+ ) AS area,
+ od.product_name,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ rw.device_name,
+ o.order_type,
+ CASE
+ WHEN LOCATE('step', #{laminating}) > 0
+ THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
+ END AS workProcessName,
+ o.batch
+ FROM
+ pp.reporting_work AS rw
+ LEFT JOIN pp.reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN pp.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 > 0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time <= #{selectTime2}
+
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="selectProcesses != null and selectProcesses != ''">
+ AND rw.this_process = #{selectProcesses}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise></otherwise>
+ </choose>
+
+ <if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
+ AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
+ </if>
+ <if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
+ AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
+ </if>
+ <if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
+ AND o.project REGEXP #{teamOutputDTO.project}
+ </if>
+ <if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
+ AND rw.process_id REGEXP #{teamOutputDTO.processId}
+ </if>
+ <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
+ AND od.edging_type REGEXP #{teamOutputDTO.edgingType}
+ </if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
+ </if>
+ <if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
+ AND o.batch REGEXP #{teamOutputDTO.batch}
+ </if>
+
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
+ ogd.`group`,
+ </if>
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ) t
+ WHERE 1 = 1
+ <if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
+ and t.workProcessName like concat('%', #{teamOutputDTO.workProcessName}, '%')
+ </if>
+ GROUP BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+
+ ORDER BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+ LIMIT #{offset}, #{pageSize};
+ </select>
+
+ <select id="teamOutputSummaryPageTotal">
+
+ select CEILING(COUNT(*) / #{pageSize}) AS pageTotal,
+ COUNT(*) AS total FROM(
+ SELECT
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName,
+
+ -- 鏁伴噺姹囨��
+ SUM(t.completed_quantity) AS completed_quantity,
+
+ -- 闈㈢Н姹囨��
+ ROUND(SUM(t.area), 2) AS area
+ FROM
+ (
+ /* ================= 鍐呭眰瀛愭煡璇紙淇濇寔涓嶅彉锛� ================= */
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ o.order_id,
+ rw.process_id,
+ fc.order_number,
+ MAX(ogd.child_width) AS width,
+ MAX(ogd.child_height) AS height,
+ od.edging_type,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(
+ MAX(ogd.child_width) * MAX(ogd.child_height)
+ * rwd.completed_quantity / 1000000,
+ 2
+ ) AS area,
+ od.product_name,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ rw.device_name,
+ o.order_type,
+ CASE
+ WHEN LOCATE('step', #{laminating}) > 0
+ THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
+ END AS workProcessName,
+ o.batch
+ FROM
+ pp.reporting_work AS rw
+ LEFT JOIN pp.reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN pp.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 > 0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time <= #{selectTime2}
+
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="selectProcesses != null and selectProcesses != ''">
+ AND rw.this_process = #{selectProcesses}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise></otherwise>
+ </choose>
+
+ <if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
+ AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
+ </if>
+ <if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
+ AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
+ </if>
+ <if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
+ AND o.project REGEXP #{teamOutputDTO.project}
+ </if>
+ <if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
+ AND rw.process_id REGEXP #{teamOutputDTO.processId}
+ </if>
+ <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
+ AND od.edging_type REGEXP #{teamOutputDTO.edgingType}
+ </if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
+ </if>
+ <if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
+ AND o.batch REGEXP #{teamOutputDTO.batch}
+ </if>
+
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
+ ogd.`group`,
+ </if>
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ) t
+ WHERE 1 = 1
+ <if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
+ and t.workProcessName like concat('%', #{teamOutputDTO.workProcessName}, '%')
+ </if>
+ GROUP BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+
+ ORDER BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+
+ ) as b
+ LIMIT #{offset}, #{pageSize};
+ </select>
+
+ <select id="exportTeamOutputSummaryMp">
+ SELECT
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName,
+ -- 鏁伴噺姹囨��
+ SUM(t.completed_quantity) AS completed_quantity,
+
+ -- 闈㈢Н姹囨��
+ ROUND(SUM(t.area), 2) AS area
+ FROM
+ (
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ o.order_id,
+ rw.process_id,
+ fc.order_number,
+ MAX(ogd.child_width) AS width,
+ MAX(ogd.child_height) AS height,
+ od.edging_type,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(
+ MAX(ogd.child_width) * MAX(ogd.child_height)
+ * rwd.completed_quantity / 1000000,
+ 2
+ ) AS area,
+ od.product_name,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ rw.device_name,
+ o.order_type,
+ CASE
+ WHEN LOCATE('step', #{laminating}) > 0
+ THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
+ END AS workProcessName,
+ o.batch
+ FROM
+ pp.reporting_work AS rw
+ LEFT JOIN pp.reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN pp.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 > 0
+ AND rw.reporting_work_time >= #{date[0]}
+ AND rw.reporting_work_time <= #{date[1]}
+
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="selectProcesses != null and selectProcesses != ''">
+ AND rw.this_process = #{selectProcesses}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise></otherwise>
+ </choose>
+
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
+ ogd.`group`,
+ </if>
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ) t
+
+ GROUP BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+
+ ORDER BY
+ t.this_process,
+ t.teams_groups_name,
+ t.workProcessName
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index 35022ef..f94fa7d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -149,6 +149,12 @@
order by id desc
</select>
+ <select id="countByCustomerName">
+ SELECT COUNT(*)
+ FROM sd.customer
+ WHERE customer_name=#{customer.customerName}
+ </select>
+
<select id="getSelectCustomer">
select
*
--
Gitblit v1.8.0