From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +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 | 12 ++++++------
north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue | 2 +-
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue | 5 ++++-
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 1 +
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 3 ++-
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 5 ++++-
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 6 +++++-
7 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
index 2c7bebb..16cc8d4 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -105,6 +105,7 @@
const prefix = obj.processId.substring(0, 11);
const orderId = obj.orderId;
const glassNumber=lastList.value[id].glassNumber
+ const customerName = obj.customerName
// 鏍规嵁 propertyName 鏇存柊灞炴��
if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
obj.productAbbreviation = result;
@@ -113,9 +114,12 @@
if (propertyName === 'project' && orderId === obj.orderId) {
obj.project = result;
}
- if (propertyName === 'productName' && glassNumber === obj.glassNumber){
+ if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
obj.productName = result;
}
+ if (propertyName === 'customerName' && orderId === obj.orderId){
+ obj.customerName = result;
+ }
});
}
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
index a6902a6..3946288 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
@@ -114,9 +114,12 @@
if (propertyName === 'project' && orderId === obj.orderId) {
obj.project = result;
}
- if (propertyName === 'productName' && glassNumber === obj.glassNumber){
+ if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
obj.productName = result;
}
+ if (propertyName === 'customerName' && orderId === obj.orderId){
+ obj.customerName = result;
+ }
});
}
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 f705f29..730b4b0 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
@@ -62,12 +62,12 @@
{field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
- {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
+ // {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+ // slots: {filter: 'num1_filter'},
+ // filterMethod: filterChanged},
+ // {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ // slots: {filter: 'num1_filter'},
+ // filterMethod: filterChanged},
{field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index 0d7ac82..e04a640 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -58,7 +58,10 @@
const columns = [
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{field: 'order_number', width: 150, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'shape',width: 130, title: t('order.shape') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ //{field: 'shape',width: 130, title: t('order.shape') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
{field: 'product_name', width: 120,title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
{field: 'child_width',width: 110, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
{field: 'child_height', width: 90,title: t('order.height'),showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
index 6770e43..171c995 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -394,7 +394,7 @@
<style scoped>
.main-div-customer {
width: 99%;
- height: 100%;
+ height: 95%;
}
#selectForm {
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 b778c2d..e33522c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -689,7 +689,8 @@
ifnull(f.inventory, 0) as inventoryNum,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
ifnull(dd.quantity, 0) as shippedQuantity,
- ifnull(dd.area, 0) as area
+ ifnull(dd.area, 0) as area,
+ JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
from flow_card as c
left join
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index f76941b..48a7405 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -75,6 +75,7 @@
from order_process_detail
where order_id = #{orderId}
group by process
+ order by id
</select>
--
Gitblit v1.8.0