From 709485dd0251b6a752d744a42e0e780727ff1649 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 八月 2025 09:44:27 +0800
Subject: [PATCH] 流程卡分架界面调整，取消报表权限
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 81 ++++++++++++++++++++++------------------
north-glass-erp/northglass-erp/src/lang/zh.js | 1
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 15 -------
3 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 3138f02..193093f 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -643,6 +643,7 @@
pleaseNumber8:'璇疯緭鍏ュ簭鍙�',
pleaseNumber9:'姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺',
pleaseNumber10:'瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺',
+ pleaseNumber11:'鍙慨鏀规暟閲忎笉瓒�',
},
productStock:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 2472063..71507ce 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -510,23 +510,29 @@
const $gridLeft = xGridLeft.value
const leftData = $gridLeft.getTableData().fullData
- //钀芥灦椤哄簭
+ // 鑾峰彇鏈�澶ц惤鏋堕『搴�
let index = 1
if (leftData.length !== 0) {
index = Math.max(...leftData.map(d => d.landingSequence || 0)) + 1
}
- // 娴佺▼鍗″彿
- let processId = null
- if (maxProcseeId) {
- const base = leftData.length !== 0 ? leftData[0].processId : maxProcseeId
- const lastThree = base.slice(-3)
- const result = parseInt(lastThree) + 1
- processId = productionId + result.toString().padStart(3, '0')
- } else {
- processId = productionId + index.toString().padStart(3, '0')
+ // 鐢熸垚 processId锛堟渶澶у熬鍙� + 1锛�
+ let maxProcIdNum = 0
+ if (leftData.length > 0) {
+ maxProcIdNum = Math.max(...leftData.map(item => {
+ const pid = item.processId
+ return parseInt(pid?.slice(-3)) || 0
+ }))
}
+ const baseIdNum = Math.max(
+ maxProcIdNum,
+ parseInt(maxProcseeId?.slice(-3) || '0')
+ ) + 1
+
+ const processId = productionId + baseIdNum.toString().padStart(3, '0')
+
+ // 鏍￠獙鏁伴噺
const regex = /^(\d+|)$/
if (!regex.test(checkedNum.value)) {
ElMessage.warning(t('processCard.schedulingNo'))
@@ -535,62 +541,65 @@
try {
if (/^[1-9]\d*$/.test(checkedNum.value)) {
- //鏈夎緭鍏ユ暟閲�
+ // 鏈夎緭鍏ユ暟閲忕殑
checkedList.forEach((item) => {
if (item.baiscQuantity < checkedNum.value * 1) {
throw new Error(t('processCard.schedulingQuantity'))
}
- item.quantity = checkedNum.value * 1
- item.processId = processId
- item.landingSequence = index // 鉁� 鍚屼竴鎵规锛岃惤鏋堕『搴忎竴鑷�
- item.baiscQuantity -= checkedNum.value * 1
- item.computeGrossArea = (
- item.computeGrossArea - item.width * item.height * checkedNum.value / 1000000
+
+ const newItem = JSON.parse(JSON.stringify(item))
+
+ newItem.quantity = checkedNum.value * 1
+ newItem.processId = processId
+ newItem.landingSequence = index
+ newItem.baiscQuantity -= checkedNum.value * 1
+ newItem.computeGrossArea = (
+ newItem.computeGrossArea - newItem.width * newItem.height * checkedNum.value / 1000000
).toFixed(2)
- const key = item._X_ROW_KEY
- delete item._X_ROW_KEY
-
- if (item.baiscQuantity === 0) {
+ if (item.baiscQuantity === newItem.quantity) {
$grid.remove(item)
+ } else {
+ item.baiscQuantity -= newItem.quantity // 淇濇寔鍙宠〃鍓╀綑鏁伴噺姝ｇ‘
+ item.computeGrossArea = (
+ item.computeGrossArea - item.width * item.height * newItem.quantity / 1000000
+ ).toFixed(2)
}
const currentLeft = $gridLeft.getTableData().fullData
$gridLeft.clearSort()
- $gridLeft.loadData([...currentLeft, item])
- item._X_ROW_KEY = key
+ $gridLeft.loadData([...currentLeft, newItem])
})
} else if (checkedNum.value === '') {
- //娌℃湁杈撳叆鏁伴噺
- checkedList.forEach((item) => {
- item.processId = processId
- item.landingSequence = index
- item.quantity = item.baiscQuantity
- delete item._X_ROW_KEY
+ // 鏈緭鍏ユ暟閲�
+ const currentLeft = $gridLeft.getTableData().fullData
+ const newList = checkedList.map(item => {
+ const newItem = JSON.parse(JSON.stringify(item))
+ newItem.quantity = newItem.baiscQuantity
+ newItem.processId = processId
+ newItem.landingSequence = index
+ return newItem
})
$grid.remove(checkedList)
- const currentLeft = $gridLeft.getTableData().fullData
$gridLeft.clearSort()
- $gridLeft.loadData([...currentLeft, ...checkedList])
+ $gridLeft.loadData([...currentLeft, ...newList])
}
+ // 娓呯┖閫夋嫨鍜岃緭鍏�
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
checkedNum.value = ''
- // 鎻掑叆鍚庤瑙夋帓搴�
- // $nextTick(() => {
- // $gridLeft.sort('landingSequence', 'asc')
- // })
} catch (e) {
- ElMessage.warning(e.message )
+ ElMessage.warning(e.message || '娴佺▼鍗″垱寤哄け璐�')
}
}
+
//鎸夌紪鍙峰垱寤烘祦绋嬪崱
const createProcessCardNo = () => {
const $grid = xGrid.value
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 01bb4a6..3a6f32e 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
@@ -30,14 +30,12 @@
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
- @SaCheckPermission("selectOrder.search")
@PostMapping("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.processCardProgressSv(orderId, columns));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
- @SaCheckPermission("crossProcessBreaking.search")
@PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -48,7 +46,6 @@
}
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
- @SaCheckPermission("workInProgress.search")
@PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
@PathVariable Integer pageNum,
@@ -63,7 +60,6 @@
}
@ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
- @SaCheckPermission("processToBeCompleted.search")
@PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result selectProcessToBeCompleted(
@PathVariable Date selectTime1,
@@ -77,7 +73,6 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
@PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result damageReport(
@PathVariable Integer pageNum,
@@ -90,7 +85,6 @@
}
@ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
- @SaCheckPermission("splittingDetailsOutside.search")
@PostMapping("/splittingDetailsOutside/{orderId}")
public Result splittingDetailsOutside(
@PathVariable String orderId,
@@ -100,7 +94,6 @@
}
@ApiOperation("鍝佽川鎶ヨ〃")
- @SaCheckPermission("qualityReport.search")
@PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
public Result qualityReport(
@PathVariable Date selectTime1,
@@ -111,7 +104,6 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
- @SaCheckPermission("yield.search")
@PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result yield(
@PathVariable Date selectTime1,
@@ -123,14 +115,12 @@
}
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
- @SaCheckPermission("productionSchedule.search")
@PostMapping("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.productionScheduleSv(orderId, columns));
}
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
- @SaCheckPermission("taskCompletionStatus.search")
@PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}/{orderId}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -140,7 +130,6 @@
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
public Result orderPlanDecomposition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -149,7 +138,6 @@
}
@ApiOperation("璁㈠崟鎶ュ伐")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
public Result orderReportingWorks(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -158,7 +146,6 @@
}
@ApiOperation("鍘熺墖棰嗘枡")
- @SaCheckPermission("rawMaterialRequisition.search")
@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
public Result rawMaterialRequisition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -167,7 +154,6 @@
}
@ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
@PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result teamOutput(
@PathVariable Integer pageNum,
@@ -291,7 +277,6 @@
}
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
- @SaCheckPermission("workInProgress.search")
@PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgressCombination(
@PathVariable Integer pageNum,
--
Gitblit v1.8.0