From 17552a47ab291980cf7709884e1c23b7ba4023bc Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 七月 2024 12:15:35 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue | 2
north-glass-erp/northglass-erp/src/hook/mouseMove.ts | 12 ++-
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 13 ++--
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 25 +++----
north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue | 2
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue | 71 +++++++++++++++++++----
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 4
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 5 -
north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue | 2
13 files changed, 92 insertions(+), 52 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
index b04fbd2..cc5e3d5 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
@@ -95,7 +95,7 @@
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
- emit('getParent')
+ //emit('getParent')
break
}
}
diff --git a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
index ed86577..d1435cc 100644
--- a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
+++ b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
@@ -28,9 +28,11 @@
xGrid.value = xGrids
gridOptions = gridOption
let newElement = document.createElement('div')
+ let leftElement = document.createElement('div')
const parser = new DOMParser();
const htmlDoc = parser.parseFromString(cellarea.value, 'text/html')
newElement.innerHTML = htmlDoc.body.innerHTML
+ leftElement.innerHTML = htmlDoc.body.innerHTML
//cellarea.value = newElement
//娣诲姞澶氶�夊垪
nextTick(() => {
@@ -58,7 +60,7 @@
// })
}
- /*setTimeout(() => {
+ setTimeout(() => {
//#region 宸︿晶鍥哄畾鍒�
let leftfixedtbody = getTablexGrid().$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper table tbody")//鑾峰彇fixedtbody鍖哄煙
@@ -73,12 +75,12 @@
let leftFixedBodyWrapper = getTablexGrid().$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper")
if (leftFixedBodyWrapper) {
//娉ㄦ剰杩欓噷鐨剅ef鍚嶇О锛岃繖閲屾槸fixed鍖哄煙鐨勬鐨勫悕绉�
- leftFixedBodyWrapper.appendChild(leftfixedcellarea.value)
+ leftFixedBodyWrapper.appendChild(leftElement)
}
//#endregion
//#region 鍙充晶鍥哄畾鍒�
- let rightfixedtbody = getTablexGrid().$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper table tbody")//鑾峰彇fixedtbody鍖哄煙
+ /* let rightfixedtbody = getTablexGrid().$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper table tbody")//鑾峰彇fixedtbody鍖哄煙
if (rightfixedtbody) {
rightfixedtbody.addEventListener("mousedown", tbodymousedown)//缁欒〃鏍间腑鐨剅ightfixedtbody娣诲姞榧犳爣鎸変笅浜嬩欢
@@ -92,10 +94,10 @@
if (rightFixedBodyWrapper) {
//娉ㄦ剰杩欓噷鐨剅ef鍚嶇О锛岃繖閲屾槸fixed鍖哄煙鐨勬鐨勫悕绉�
rightFixedBodyWrapper.appendChild(rightfixedcellarea.value)
- }
+ }*/
//#endregion
- }, 100)*/
+ }, 100)
})
}
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index 63b441c..6fd1acf 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -16,7 +16,7 @@
const router = useRouter()
const userStore = useUserInfoStore()
-const user = userStore.user.userName
+const user = userStore.user?.userName
//鐩戝惉寮傛杩斿洖浠ｇ爜
watch(()=>userStore.responseCode,(newVal) => {
switch (newVal){
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
index ab70d0c..0f1cc80 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairProcess.vue
@@ -34,12 +34,46 @@
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
- if (printMerge!==null && printMerge!==undefined && printMerge!==""){
+ if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
produceList.value.forEach(item => {
item.detail[0].technologyNumber = printMerge;
});
}
+ let technologyNumberMerge = printMerge.split('').join(',');
+ console.log(technologyNumberMerge)
+ produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
+ console.log(produceList.value[0].detail[0])
+ const s01Values = [];
+ // 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ produceList.value[0].detailList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+ // 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ produceList.value[0].detailList.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+
+
+
+
+
handleGetQRCode()
} else {
ElMessage.warning(res.msg)
@@ -48,7 +82,6 @@
})
}
-
)
@@ -71,8 +104,6 @@
}
}
};
-
-
// 鎵撳嵃鏂规硶
@@ -120,10 +151,14 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="24">
- <div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
+ <div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div>澶╂触鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ </div>
+ <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
@@ -135,7 +170,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="16">{{ items.process }}</td>
+ <td colspan="17">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -143,10 +178,11 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="2">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="16">{{ itemTr.product_name }}</td>
+ <td colspan="17">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
+ <td rowspan='2'>缂栧彿</td>
<td rowspan='2'>瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
@@ -186,6 +222,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
+ <td>{{itemDatile.s01Value}}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item">{{ itemDatile.quantity }}</td>
<td>{{ itemDatile.total_area }}</td>
@@ -216,9 +253,9 @@
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area,2) }}</label>
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
- <label>{{ itemsum.weight }}</label>
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
@@ -242,9 +279,12 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
+ <td></td>
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
+ <td></td>
<td></td>
<td></td>
<td></td>
@@ -280,15 +320,18 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="19" >
+ <td colspan="19">
<span style="display: flex;">
- <span style="display: flex;width: 25%" v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index">
+ <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
<div class='qrCode' style="width: 80px;height: 80px;">
- <img :src= qrCodeItems.qrcode>
+ <img :src=qrCodeItems.qrcode>
</div>
- <span style="float: left;font-weight: bolder">{{ qrCodeItem.process_id+"/"+qrCodeItems.technologyNumber }}</span>
+ <span style="float: left;font-weight: bolder">{{
+ qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
+ }}</span>
</span>
</span>
</td>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
index 59cb7cb..8311031 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -66,7 +66,7 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'basicName',
title: t('machine.basicName'),
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
index cc0a0c1..51ac9fe 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
@@ -73,7 +73,7 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'deviceName',
title: t('machine.basicName'),
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
index acb31d0..97f4394 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -53,7 +53,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
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 ed6c5ec..6431867 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
@@ -146,7 +146,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'CustomerListRight',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
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 81187d5..f527422 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
@@ -98,10 +98,10 @@
value: '1',
label: t('processCard.finishedProductLabel'),
},
- // {
- // value: '2',
- // label: t('processCard.halfProductLabel'),
- // },
+/* {
+ value: '2',
+ label: t('processCard.halfProductLabel'),
+ },*/
{
value: `${company.printLabel.labelValue}`,
label: `${company.printLabel.labelType}`,
@@ -285,8 +285,7 @@
}
}
- let printMergeVal=printMerge.value.split('').join(',')
- console.log(printMergeVal)
+ let printMergeVal=printMerge.value
router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
break
@@ -382,7 +381,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'demo_2',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
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 5685462..39b432d 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
@@ -24,7 +24,6 @@
const route = currentRoute.value
const printMerge = route.query.printMerge
data.value.printList = JSON.parse(route.query.printList)
-console.log(route.query.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
// if (id === null || id === undefined || id === '') {
@@ -38,20 +37,14 @@
if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
produceList.value.forEach(item => {
- item.detail[0].technologyNumber = printMerge.split(',').join('');
+ item.detail[0].technologyNumber = printMerge;
});
}
+ let technologyNumberMerge = printMerge.split('').join(',');
+ console.log(technologyNumberMerge)
+ produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
+ console.log(produceList.value[0].detail[0])
const s01Values = [];
- //
- // // 鑾峰彇姣忎釜鍏冪礌鐨� S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
- // produceList.value[0].numberList.forEach(element => {
- // const otherColumnsObject = JSON.parse(element.other_columns);
- // const s01Value = otherColumnsObject.S01;
- // s01Values.push(s01Value);
- // });
- // produceList.value[0].detailList.forEach((detail, index) => {
- // detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
- // });
// 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
produceList.value[0].detailList.forEach(element => {
try {
@@ -161,7 +154,11 @@
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>澶╂触鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ </div>
+ <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
@@ -258,7 +255,7 @@
闈㈢Н锛�
<label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
閲嶉噺锛�
- <label>{{ itemsum.weight }}</label>
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
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 14b02ae..132bd11 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
@@ -499,7 +499,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'CustomerListDetail',
//showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -651,7 +651,6 @@
addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
- //addListener(xGrid.value, gridOptions)
}
@@ -1126,7 +1125,7 @@
}
onMounted(() => {
window.addEventListener('keypress', qrcodeScanner);
- // addListener(xGrid.value, gridOptions)
+ //addListener(xGrid.value, gridOptions)
})
// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index d33e86d..45ffb33 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -109,7 +109,7 @@
{ code: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
{ code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
- { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: true }
+ { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
]
]
}
@@ -672,7 +672,7 @@
//宸ヨ壓瀹℃牳鍚庯紝璁㈠崟鏈鏍� 鍙栨秷瀹℃牳鎸夐挳绂佺敤鍜屽昂瀵稿鏍�
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
gridOptions.toolbarConfig.buttons[2].disabled = false
- gridOptions.menuConfig.body.options[0][8].disabled =false
+ //gridOptions.menuConfig.body.options[0][8].disabled =false
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
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 0993b46..0fb3fac 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,
- round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2) as weight,
+ sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
from flow_card as fc
--
Gitblit v1.8.0