From c831630ab5e43e5bb94cebd8c8765bd3376feec6 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 12 八月 2025 16:42:40 +0800
Subject: [PATCH] 提交流程卡显示入库数量
---
north-glass-erp/northglass-erp/src/lang/en.js | 1 +
north-glass-erp/northglass-erp/src/lang/ar.js | 1 +
north-glass-erp/northglass-erp/src/lang/ru.js | 1 +
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 4 ++--
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 2 +-
north-glass-erp/northglass-erp/src/lang/zh.js | 1 +
north-glass-erp/northglass-erp/src/lang/kr.js | 1 +
7 files changed, 8 insertions(+), 3 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 b154c5f..decae59 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
@@ -86,7 +86,7 @@
{field: 'shippedQuantity',slots: { default: 'show'},width: 120, title: t('delivery.deliveryQuantity')},
{field: 'inventory',slots: { default: 'show'},width: 120, title: t('productStock.inventoryQuantity')},
{field: 'inventoryArea',slots: { default: 'show'},width: 120, title: t('report.inventoryArea')},
- {field: 'StorageArea',slots: { default: 'show'},width: 120, title: t('report.inventoryNum')},
+ {field: 'StorageArea',slots: { default: 'show'},width: 120, title: t('report.StorageArea')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,8,10,11,12,13,14]
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 61e2d62..5bb7a53 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -1073,6 +1073,7 @@
finished :'賲毓丿賱 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
finishedProductReport :'鬲賯乇賷乇 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н'
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 8550b2d..d9cb0ff 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -1076,6 +1076,7 @@
finished :'Rate of finished product',
finishedProductReport :'Finished product report',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н'
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 110324b..a185c37 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -1084,6 +1084,7 @@
finished :'鞏戫拡毳�',
finishedProductReport :'鞕勳牅頀� 氤搓碃靹�',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н'
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index ccaf486..383657a 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -1072,6 +1072,7 @@
finished :'袣芯褝褎褎懈褑懈械薪褌 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н'
},
productionBasicData:{
page:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 960d9e6..f5a83b3 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -1088,6 +1088,7 @@
finished :'鎴愬搧鐜�',
finishedProductReport :'鎴愬搧鎶ヨ〃',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н'
},
productionBasicData:{
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 29ef5dd..49f9fad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -190,13 +190,13 @@
ifnull(f.inventory, 0) as inventoryShow,
round(ifnull(f.inventory, 0) * a.compute_area, 2) as inventoryAreaShow, -- 搴撳瓨闈㈢Н
ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
- (ifnull(dd.quantity, 0)+ifnull(f.inventory, 0))*a.compute_area as StorageAreaShow,-- 鍏ュ簱闈㈢Н
+ (ifnull(c.received_quantity, 0))*a.compute_area as StorageAreaShow,-- 鍏ュ簱闈㈢Н
if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,0) as grossArea,
if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.compute_area, 2),0) as inventoryArea,
if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
- if(c.technology_number=1,(ifnull(dd.quantity, 0)+ifnull(f.inventory, 0))*a.compute_area,0) as StorageArea,
+ if(c.technology_number=1,(ifnull(c.received_quantity, 0))*a.compute_area,0) as StorageArea,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
--
Gitblit v1.8.0