From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 327 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 282 insertions(+), 45 deletions(-)
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 39783f8..8bf68e4 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
@@ -14,12 +14,15 @@
import useUserInfoStore from "@/stores/userInfo";
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
+import {changeFilterEvent,filterChanged} from "@/hook"
+import userInfo from "@/stores/userInfo"
//璇█鑾峰彇
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
+const user=userInfo()
let flag = $ref(true)
function intoCreateProduct() {
@@ -68,27 +71,29 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-let orderId = route.query.orderId
-let productionId = route.query.productionId
+const orderId = route.query.orderId
+const productionId = route.query.productionId
const orderOtherMoney = ref(null)
-
+let maxProcseeId=null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
+ maxProcseeId=res.data.maxFlowCard[0].process_id
orderOtherMoney.value = res.data.orderOtherMoney
orderOtherMoney.value.forEach(item => {
let column = {
field: `${item.column}`,
- width: 85,
+ width: 100,
title: item.alias,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
+ sortable: true
}
gridOptions.columns.push(column)
@@ -102,11 +107,7 @@
}
})
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
+
function padLeftZero(str) {
return ('00' + str).substr(str.length)
@@ -120,14 +121,7 @@
}
-//绛涢�夋柟娉�
-const filterChanged = ({option, row, column}) => {
- if (option.data) {
- return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
- }
- return true
- //@filter-change="filterChanged"
-}
+
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -150,6 +144,54 @@
},
filterConfig: { //绛涢�夐厤缃」
//remote: true
+ },
+ formConfig: {
+ data: {
+ shelfThickness: 800,
+ spacerThickness: 0,
+ inWeight: 4000,
+ inMaxQuantity: 20,
+ inLenMin:400,
+ inLenMax:3500,
+ inShortMax:2500,
+ inShortMin:400
+ },
+ rules:{
+ shelfThickness: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ],
+ spacerThickness: [
+ { required: true, message: t('delivery.pleaseEnterANumericalValueGreaterThanOrEqualTo0'),type:'number',pattern:/^[0-9]\d*$/ }
+ ],
+ inWeight: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ],
+ inMaxQuantity: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ]
+ },
+ items:[
+ { field: 'shelfThickness', title: '鏋跺瓙绾垫繁(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true},
+ { field: 'inWeight', title: '鏋跺瓙鎵块噸锛圞G锛�', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'spacerThickness', title: '闂撮殧鍘氬害(mm)', itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inLenMax', title: '闀胯竟鏈�澶�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inLenMin', title: '闀胯竟鏈�鐭�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inMaxQuantity', title: '鏈�澶ф暟閲�', itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inShortMax', title: '鐭竟鏈�澶�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inShortMin', title: '鐭竟鏈�鐭�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ {
+ span: 24,
+ collapseNode: true,
+ align: 'center',
+ itemRender: {
+ name: 'VxeButtonGroup',
+ options: [
+ { type: 'submit', content: '鏅鸿兘鍒嗘灦', status: 'primary' },
+ { type: 'reset', content: '閲嶇疆' }
+ ]
+ }
+ }
+ ]
},
customConfig: {
storage: true
@@ -199,14 +241,24 @@
filterMethod: filterChanged,
width: '78px'
},
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
{field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
{field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
- {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged}
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'processing_note', title: t('order.processingNote'), width: '105px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'bend_radius', title: t('order.bendRadius'), width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -240,13 +292,32 @@
})
return parseFloat(count.toFixed(2))
}
-
return ''
})
]
},
})
+const gridEventsRight = {
+ formSubmit () {
+ let form = gridOptions.formConfig.data
+ form.orderId =orderId
+ form.productionId = productionId
+ request.post(`/processCard/processCardAutoRack`,form).then(res => {
+ xGridLeft.value.reloadData(res.data.orderDetailList)
+ xGrid.value.reloadData(res.data.orderDetailsNotScope)
+ })
+ },
+ formReset () {
+ router.push({
+ path: '/main/processCard/AddProcessCard',
+ query: {orderId: orderId,
+ productionId: productionId,
+ random:Math.random()
+ }
+ })
+ }
+}
//宸︿晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGridLeft = ref()
@@ -313,6 +384,15 @@
filterMethod: filterChanged,
width:70
},
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
{field: 'width', title: t('order.width'), showOverflow: "ellipsis",width:70},
{field: 'height', title: t('order.height'),width:70},
{field: 'quantity', title: t('order.quantity'),width:70},
@@ -366,7 +446,32 @@
index = leftData[0].landingSequence + 1
//index = index.toString().padStart(2, '0')
}
- const processId = productionId + index.toString().padStart(3, '0')
+ let processId= null
+ // if (leftData.length !== 0){
+ // processId = productionId + index.toString().padStart(3, '0')
+ // }
+ // else {
+ if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
+ if (leftData.length !== 0){
+ const str=leftData[0].processId
+ const lastThree = str.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+ else {
+ // 鎴彇鍚庝笁浣�
+ const lastThree = maxProcseeId.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+
+ }
+ else {
+ processId = productionId + index.toString().padStart(3, '0')
+ }
+ //}
+
+
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
ElMessage.warning(t('processCard.schedulingNo'))
@@ -415,6 +520,78 @@
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
}
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
+}
+
+
+//鎸夌紪鍙峰垱寤烘祦绋嬪崱
+const createProcessCardNo = () => {
+ const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+
+ if (checkedList.length === 0) {
+ ElMessage.warning(t('processCard.schedulingOk'))
+ return
+ }
+ //productionId
+ const $gridLeft = xGridLeft.value
+ const leftData = $gridLeft.getTableData().fullData
+ let index = 0
+ if (leftData.length !== 0) {
+ index = leftData[0].landingSequence + 1
+ //index = index.toString().padStart(2, '0')
+ }
+
+ let processId= null
+
+ if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
+ if (leftData.length !== 0){
+ const str=leftData[0].processId
+ const lastThree = str.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+ else {
+ // 鎴彇鍚庝笁浣�
+ const lastThree = maxProcseeId.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+
+ }
+ else {
+
+ processId = productionId + index.toString().padStart(3, '0')
+
+
+ }
+
+
+ const regex = /^(\d+|)$/;
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
+ return
+ }
+
+ checkedList.forEach((item) => {
+ index++
+ processId = productionId + index.toString().padStart(3, '0')
+ item.processId = processId
+ item.landingSequence = index
+ item.quantity = item.baiscQuantity
+ })
+ //鍒犻櫎key
+ checkedList.forEach((item) => {
+ delete item._X_ROW_KEY
+ })
+ $gridLeft.insertAt(checkedList)
+ $grid.remove(checkedList)
+ //娓呴櫎涓よ竟澶嶉�夋
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
+
}
@@ -496,36 +673,79 @@
} else {
-
- // item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
- // item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
- //item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
- // for (let i = 0; i <checkedList.length ; i++) {
- //
- // if (checkedList[i].orderNumber === item.orderNumber){
- // console.log(item.baiscQuantity +"---"+ checkedList[i].quantity )
- // item.baiscQuantity = item.baiscQuantity * 1 + checkedList[i].quantity * 1
- // }
- // }
-
delete item._X_ROW_KEY
$grid.insert(item)
-
}
$gridLeft.remove(item)
})
-
}
+
+ let leftDataList = $gridLeft.getTableData().fullData;
+ let baseProcessId = productionId; // 鍥哄畾鐨勫墠缂�
+
+ // 缁熻鎵�鏈変笉閲嶅鐨� processId
+ let uniqueProcessIds = new Set(leftDataList.map(item => item.processId));
+ // 涓嶉噸澶嶇殑 processId 鐨勬�讳釜鏁�
+ let totalUniqueCount = uniqueProcessIds.size;
+ // 鐢ㄤ簬璁板綍宸茬粡鍒嗛厤鐨� processId
+ let usedProcessIds = new Set();
+
+ leftDataList.forEach((item) => {
+ let newProcessId;
+ // 濡傛灉璇� processId 鏄涓�娆″嚭鐜帮紝浣跨敤閫掑噺鐨勭紪鍙风敓鎴愭柊鐨� processId
+ if (!usedProcessIds.has(item.processId)) {
+ newProcessId = `${baseProcessId}${(totalUniqueCount).toString().padStart(3, '0')}`;
+ usedProcessIds.add(item.processId); // 鏍囪璇� processId 宸蹭娇鐢�
+ totalUniqueCount--; // 閫掑噺
+
+ } else {
+ // 濡傛灉璇� processId 宸茬粡浣跨敤杩囷紝缁х画浣跨敤宸插垎閰嶇殑缂栧彿
+ newProcessId = `${baseProcessId}${(totalUniqueCount + 1).toString().padStart(3, '0')}`;
+
+ }
+ // 鏇存柊 item.processId
+ item.processId = newProcessId;
+ });
+ // 鑾峰彇鍓╀綑鏁版嵁,鐢ㄤ簬瀵硅惤鏋堕『搴忛噸鏂拌祴鍊�
+ let remainingData = $gridLeft.getTableData().fullData;
+ // 鎸� processId 鍒嗙粍
+ let groupedData = remainingData.reduce((acc, curr) => {
+ if (!acc[curr.processId]) {
+ acc[curr.processId] = [];
+ }
+ acc[curr.processId].push(curr);
+ return acc;
+ }, {});
+
+ // 鎸� processId 鎺掑簭锛堝�掑簭锛�
+ let sortedProcessIds = Object.keys(groupedData).sort((a, b) => b - a);
+
+ // 鏇存柊姣忎釜鍒嗙粍鐨� landingSequence
+ sortedProcessIds.forEach((processId, index) => {
+ let group = groupedData[processId];
+
+ // 瀵规瘡涓� processId 鍒嗙粍鍐呯殑鏁版嵁锛屼笉鏀瑰彉椤哄簭锛岀洿鎺ヨ祴鐩稿悓鐨� landingSequence
+ group.forEach((item) => {
+ item.landingSequence = sortedProcessIds.length - index; // 鎸夊�掑簭璁剧疆 landingSequence
+ });
+ });
//娓呴櫎涓よ竟澶嶉�夋
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
+
} catch (e) {
ElMessage.warning(e.message)
}
+ //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
+
+
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
const addLeft = () => {
try {
@@ -575,6 +795,7 @@
if (item.baiscQuantity === 0) {
$grid.remove(item)
}
+ $gridLeft.reloadData([...$gridLeft.getTableData().fullData])
//delete item._X_ROW_KEY
} else {
item.quantity = checkedNum.value
@@ -626,9 +847,8 @@
checkedList.forEach((item) => {
item.processId = checkedListLeft[0].processId
item.landingSequence = checkedListLeft[0].landingSequence
- item.quantity = checkedListLeft[0].baiscQuantity
+ item.quantity = item.baiscQuantity
item.computeGrossArea = (item.computeGrossArea - checkedListLeft[0].width * checkedListLeft[0].height * checkedListLeft[0].baiscQuantity / 1000000).toFixed(2)
-
delete item._X_ROW_KEY
})
$gridLeft.insertAt(checkedList)
@@ -643,6 +863,9 @@
} catch (e) {
ElMessage.warning(e.message)
}
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
@@ -653,6 +876,7 @@
if ($grid) {
switch (code) {
case 'saveFlowCard': {
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=true
const $table = xGridLeft.value
const $tableRight = xGrid.value
if ($table) {
@@ -661,20 +885,28 @@
let leftData = $tableRight.getTableData().fullData
if (selectRecords.length === 0) {
ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return
}
if (leftData.length > 0) {
ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return;
}
+ // if (leftData.length!=selectRecords.length){
+ // ElMessage.warning('璇峰嬀閫夋墍鏈夋暟鎹繘琛屼繚瀛�')
+ // gridLeftOptions.toolbarConfig.buttons[0].disabled=false
+ // return;
+ // }
let flowCardData = ref({
flowCard: selectRecords,
userName: username,
- productionId: productionId
+ productionId: productionId,
+ userId:user.user.userId
})
- request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
+ request.post(`/processCard/addFlowCard/${orderId}`, flowCardData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.saveSuccess'))
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
@@ -722,9 +954,7 @@
<template>
<div style="width: 75%;height: 90%">
-
- <div class="common-layout" style="width: 100%;height: 100%">
-
+ <div class="common-layout">
<el-button
id="searchButton1"
:icon="ArrowLeftBold"
@@ -765,6 +995,7 @@
<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>
@@ -779,7 +1010,7 @@
<span><el-input v-model="quantit" style="width: 80px;"/></span>
<span><el-input v-model="weight" style="width: 80px;"/></span>
</div>
- <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
+ <span>{{ $t('processCard.selectedQuantity') }}:<el-input id="checkedNum" v-model="checkedNum" clearable
type="number"></el-input></span><br>
<el-button style="width: 40px;" type="primary" @click="addRight"> 鈫�</el-button>
<br>
@@ -788,6 +1019,9 @@
<br>
<br>
<el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
+ </el-button>
+ <br><br><br><br><br>
+ <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
</el-button>
</el-main>
</div>
@@ -804,6 +1038,7 @@
class="mytable-scrollbar"
height="100%"
v-bind="gridOptions"
+ v-on="gridEventsRight"
@checkbox-change="handleCheckboxChange"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -828,6 +1063,7 @@
<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>
@@ -847,7 +1083,8 @@
}
.common-layout {
- height: 100%;
+ width: 99%;
+ height: 96%;
}
.header {
--
Gitblit v1.8.0