From 1950035a0202314a2150c4c843036ea66bba3370 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 七月 2024 13:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 3 ++-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 4 +---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 7 ++++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
index 9ce01d4..29766bc 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -37,7 +37,8 @@
contacts:'order.contacts',
deliveryAddress:'order.deliveryAddress',
processingNote:'order.processingNote',
- remarks:'product.msg.remarks'
+ remarks:'product.msg.remarks',
+ customerAbbreviation:'customer.customerAbbreviation'
})
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 0856a02..3f1e8f3 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
@@ -424,11 +424,9 @@
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
//鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
- if(column.title=="娆＄牬鏁伴噺"){
+ if(column.field=="breakageQuantity"){
brokenVisible.value = true
}
-
-
},
menuClick({menu, row, column}) {
const $grid = xGrid.value
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 344e39b..3720314 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -636,7 +636,7 @@
select o.order_id as orderId,
project,
customer_id as customerId,
- customer_name as customerName,
+ o.customer_name as customerName,
order_type as orderType,
order_classify as orderClassify,
batch,
@@ -658,13 +658,14 @@
od.building_number as buildingNumber,
od.product_name as productName,
od.edging_type as edgingType,
- p.remarks
-
+ p.remarks,
+ c.customer_abbreviation as customerAbbreviation
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join flow_card as fc on o.order_id = fc.order_id and
od.order_number = fc.order_number
left join sd.product as p on p.id=od.product_id
+ left join sd.customer as c on c.id = o.customer_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
--
Gitblit v1.8.0