From eac052747b0062b64febe994a8f8b82d56c5838a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 三月 2025 15:44:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 3 ++-
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue | 2 +-
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 1 +
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index bef4ae0..a01fef4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -65,6 +65,7 @@
{field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'gross_area', width: 90,title: t('order.area')},
{field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
{field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
{field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
index c7af0c4..e2d57ec 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue
@@ -32,7 +32,7 @@
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/ingredientsStock/AccessoriesMonthlySettlement' }">杈呮枡鏈堢粨</el-breadcrumb-item>-->
<el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/ingredientsStock/returnToStorage' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectSurplusMaterials' }">{{$t('ingredientsStock.surplusMaterialManagement')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(7)" :class="indexFlag===7?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialAdditionRecord' }">{{$t('鐗╂枡鏂板')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(7)" :class="indexFlag===7?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialAdditionRecord' }">{{$t('ingredients.materialAddition')}}</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
</el-breadcrumb>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 6583a68..71b210d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -198,6 +198,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'gross_area', width: 90,title: t('order.area')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
// {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
{field: 'inventory',width: 120, title: t('report.inventoryNum')},
@@ -223,7 +224,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity", "broken_num", "inventory", "inventoryArea"]; // 闈欐�佸垪鐨勬眰鍜�
+ const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 闈欐�佸垪鐨勬眰鍜�
if (List.includes(column.field)) {
return footSum(data, column.field)
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index c41dc89..02f922f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -170,6 +170,7 @@
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
+ c.quantity*a.area as gross_area,
ifnull(f.inventory, 0) as inventory,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
ifnull(dd.quantity, 0) as shippedQuantity,
--
Gitblit v1.8.0