From 74e77ff9778f602e92a9634708fea35b4eb7d42f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 16:38:55 +0800
Subject: [PATCH] 限制报工时间不能是未来时间，与当前时间间隔不能超过15天，补充相关语言
---
north-glass-erp/northglass-erp/src/lang/en.js | 6 +++
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 1
north-glass-erp/northglass-erp/src/lang/ar.js | 7 +++
north-glass-erp/northglass-erp/src/lang/ru.js | 7 +++
north-glass-erp/northglass-erp/src/lang/zh.js | 3 +
north-glass-erp/northglass-erp/src/lang/kr.js | 7 +++
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 38 ++++++++----------
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 ++
8 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index edec0a6..61e2d62 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -406,6 +406,9 @@
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
},
+ buildingNumber:'妤煎彿',
+ longSide:'闀胯竟',
+ shortSide:'鐭竟',
printCompound:'闇�瑕佸悓鏋剁殑灞�',
flashback:'鍊掑簭',
processId:'乇賯賲 亘胤丕賯丞 丕賱毓賲賱賷丞',
@@ -619,8 +622,10 @@
passAudit:'鬲賲鬲 丕賱賲賵丕賮賯丞',
patchCondition:'琛ョ墖鐘舵��',
changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
+ hiddenVal:'闅愯棌',
-
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
selectResponsibleTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
selectWorkReportingTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
successfulModificationOfWorkApplication:'鬲賲 鬲毓丿賷賱 丕賱鬲賯乇賷乇 亘賳噩丕丨',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index ab10272..8550b2d 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -406,6 +406,9 @@
printFlowCard:"Process card printing",
selectDetailProcessCard:"Process card details query"
},
+ buildingNumber:'妤煎彿',
+ longSide:'闀胯竟',
+ shortSide:'鐭竟',
printCompound:'闇�瑕佸悓鏋剁殑灞�',
flashback:'鍊掑簭',
processId:'Process Card Number',
@@ -621,7 +624,10 @@
passAudit:'Pass The Audit',
patchCondition:'Patch Condition',
changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
+ hiddenVal:'闅愯棌',
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
selectResponsibleTeam:'Please select a responsible team',
selectWorkReportingTeam:'Please select a responsible team',
successfulModificationOfWorkApplication:'Report modification succeeded',
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 16f6eff..110324b 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -415,6 +415,9 @@
selectDetailProcessCard:'頂勲靹胳姢 旃措摐 靸侅劯 臁绊殞'
},
+ buildingNumber:'妤煎彿',
+ longSide:'闀胯竟',
+ shortSide:'鐭竟',
printCompound:'闇�瑕佸悓鏋剁殑灞�',
flashback:'鍊掑簭',
processId:'頂勲靹胳姢 旃措摐 氩堩樃',
@@ -628,8 +631,10 @@
passAudit:'鞀轨澑 鞕勲',
patchCondition:'韺箻 靸來儨',
changeFailed:'靾橃爼 鞁ろ尐, 鞁れ爜 氤搓碃 鞚搓磤 欤茧 鞐秬 頇曥澑頃� 欤检劯鞖�',
+ hiddenVal:'闅愯棌',
-
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
selectResponsibleTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
selectWorkReportingTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
successfulModificationOfWorkApplication:'鞛戩梾 氤搓碃 靾橃爼 靹标车',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 70e6306..ccaf486 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -404,6 +404,9 @@
printFlowCard:"娴佺▼鍗℃墦鍗�",
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
},
+ buildingNumber:'妤煎彿',
+ longSide:'闀胯竟',
+ shortSide:'鐭竟',
printCompound:'闇�瑕佸悓鏋剁殑灞�',
flashback:'鍊掑簭',
processId:'袧芯屑械褉 锌褉芯褑械褋褋邪',
@@ -617,8 +620,10 @@
passAudit:'袩褉芯胁械褉泻邪 锌褉芯褕谢邪',
patchCondition:'琛ョ墖鐘舵��',
changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
+ hiddenVal:'闅愯棌',
-
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
selectResponsibleTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
selectWorkReportingTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
successfulModificationOfWorkApplication:'袠蟹屑械薪械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹懈 褍褋锌械褕薪芯',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 2709907..a3581a6 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -637,7 +637,8 @@
changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
hiddenVal:'闅愯棌',
-
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
selectResponsibleTeam:'璇烽�夋嫨璐ｄ换鐝粍',
selectWorkReportingTeam:'璇烽�夋嫨璐ｄ换鐝粍',
successfulModificationOfWorkApplication:'鎶ュ伐淇敼鎴愬姛',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 99b3feb..9ed0775 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1003,6 +1003,23 @@
return
}
+ const reportingWorkTime = titleUploadData.value.reportingWorkTime
+ const currentTime = new Date()
+ const targetTime = new Date(reportingWorkTime)
+ //鏈潵鏃堕棿
+ if (targetTime > currentTime) {
+ ElMessage.error(t('reportingWorks.futureTime'))
+ return
+ }
+ // 涓や釜鏃堕棿鐨勬绉掑樊
+ const diffMs = currentTime - targetTime
+ // 杞崲涓哄ぉ鏁�
+ const diffDays = diffMs / (1000 * 60 * 60 * 24)
+ if (diffDays > 15) {
+ ElMessage.error(t('reportingWorks.longTime'))
+ return
+ }
+
const seenIds = {}
const uniqueByOrderNum = xGrid.value.getTableData().fullData.filter(item => {
// 妫�鏌tem鐨刬d鏄惁宸茬粡鍦╯eenIds涓�
@@ -1282,27 +1299,6 @@
//鍒ゆ柇鏃╂櫄鐝�
titleUploadData.value.classes=t('reportingWorks.early')
titleUploadData.value.reportingWorkTime = formatCurrentTime()
-
- //澶勭悊缂栧彿鍒�
- //瀹氫箟瀛樻斁缂栧彿鏁扮粍
- const s01Values = [];
- for (let i = 0; i < res.data.Detail.length; i++) {
- const s01Values = [];
- // 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
- if (res.data.Detail[i].other_columns!=null|| res.data.Detail[i].other_columns!=undefined){
- res.data.Detail.forEach(element => {
- const otherColumnsObject = JSON.parse(element.other_columns);
- const s01Value = otherColumnsObject.S01;
- s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
- });
-
- // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
- res.data.Detail.forEach((detail, index) => {
- detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
- });
- }
-
- }
//缁戝畾涓嬫柟琛ㄦ牸
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 35c3096..6500b96 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -690,7 +690,6 @@
//鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
}
- System.out.println(1);
//鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
reportingWorkMapper.deleteWork(reportingWorkId);
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index d1996b7..985cfc1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -208,7 +208,8 @@
ogd.`group`,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
od.other_columns,
- ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
+ ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
od.building_number) as s01Value
@@ -434,6 +435,9 @@
ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
e.other_columns,
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
+ od.building_number) as s01Value
IF(count(pl.id)>0,'宸茶ˉ鐗�','') as patchStatusOther,
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
--
Gitblit v1.8.0