From 60059736395d7f0efe7bfffe5e186001d7b157b4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 七月 2024 08:58:34 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 2 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 26 ++++++++++++++++++++++----
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 5 ++++-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 4 ++--
north-glass-erp/northglass-erp/src/lang/zh.js | 1 +
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 8 ++++----
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 3 ++-
7 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 93be06e..4ed05ae 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -372,7 +372,7 @@
deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
pleaseCheckTheRequiredData:'Please check the required data',
-
+ landingSequence:'Landing sequence',
labelStyle:'Label Style',
customLabelPrinting:'Custom label printing',
labelPrinting:'Label printing',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 6339fc8..b11a51c 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -372,6 +372,7 @@
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�',
deleteNoProcedure:'鍒犻櫎澶辫触锛屾鏌ヤ笅宸ュ簭鏄惁宸叉姤宸�',
pleaseCheckTheRequiredData:'璇峰嬀閫夐渶瑕佺殑鏁版嵁',
+ landingSequence:'钀芥灦椤哄簭',
labelStyle:'鏍囩鏍峰紡',
customLabelPrinting:'鑷畾涔夋爣绛炬墦鍗�',
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 88a8e0d..ed6c5ec 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
@@ -222,20 +222,38 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
+
+ weighAllAmount(data) {
+ let count = 0
+ data.forEach(row => {
+ count += row.weight
+ })
+ return count
+ },
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let count = 0
+
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["baiscQuantity",'computeGrossArea','weight','perimeter']
+
+ const List = ["baiscQuantity",'computeGrossArea']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
+ if (column.field === 'weight'){
+ data.forEach(row => {
+ count += weightSum(row)
+ })
+ return parseFloat(count.toFixed(2))
+ }
+
return ''
})
]
- }
+ },
})
@@ -289,7 +307,7 @@
},
{
field: 'landingSequence',
- title: '钀芥灦椤哄簭',
+ title: t('processCard.landingSequence'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -325,7 +343,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'goodsQuantity','area','perimeter']
+ const List = ["quantity",'goodsQuantity','area']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index d021a52..81187d5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -284,7 +284,10 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})
+
+ let printMergeVal=printMerge.value.split('').join(',')
+ console.log(printMergeVal)
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
break
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index d88d9fd..5685462 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -38,7 +38,7 @@
if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
produceList.value.forEach(item => {
- item.detail[0].technologyNumber = printMerge;
+ item.detail[0].technologyNumber = printMerge.split(',').join('');
});
}
const s01Values = [];
@@ -256,7 +256,7 @@
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area, 2) }}</label>
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
<label>{{ itemsum.weight }}</label>
</td>
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 2e80ba5..14b02ae 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
@@ -211,7 +211,7 @@
showStatus: true
},
menuConfig: {
- body: {
+ /*body: {
options: [
[
{
@@ -237,7 +237,7 @@
},
]
]
- }
+ }*/
},
//琛ㄥご鍙傛暟
columns: [
@@ -651,7 +651,7 @@
addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
- addListener(xGrid.value, gridOptions)
+ //addListener(xGrid.value, gridOptions)
}
@@ -1126,7 +1126,7 @@
}
onMounted(() => {
window.addEventListener('keypress', qrcodeScanner);
- addListener(xGrid.value, gridOptions)
+ // addListener(xGrid.value, gridOptions)
})
// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
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 2fb351d..0993b46 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -483,7 +483,7 @@
fc.process_id,
SUM(od.quantity) as quantity,
round(SUM(ogd.total_area), 2) as gross_area,
- SUM(od.weight) as weight,
+ round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
from flow_card as fc
@@ -492,6 +492,7 @@
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
left join sd.`order` as o on o.order_id = fc.order_id
+ left join sd.product as p on p.id=od.product_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.technology_number
--
Gitblit v1.8.0