From cd4a24e07e643b5be854f0a355e040e382062e2b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 七月 2024 11:35:22 +0800
Subject: [PATCH] 添加标签样式需要的字段
---
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 27 ++++++++++++++++++++++-----
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 14 +++++++++++++-
2 files changed, 35 insertions(+), 6 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 29766bc..0e90d40 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -26,19 +26,36 @@
productName:'order.product',
edgingType:"order.edgingType",
buildingNumber:'order.buildingNumber',
- icon:'order.icon',
orderClassify:'order.orderClassify',
packType:'order.packType',
deliveryDate:'order.deliveryDate',
- batch:'order.batch',
salesman:'order.salesman',
alType:'order.alType',
customerBatch:'order.customerBatch',
- contacts:'order.contacts',
- deliveryAddress:'order.deliveryAddress',
processingNote:'order.processingNote',
remarks:'product.msg.remarks',
- customerAbbreviation:'customer.customerAbbreviation'
+ customerAbbreviation:'customer.customerAbbreviation',
+ productAbbreviation:'product.msg.productAbbreviation',
+ processId:'processCard.processId',
+ createTime:'涓嬪崟鏃ユ湡',
+ orderNumber:'order.OrderNum',
+ technologyNumber:'processCard.technologyNumber',
+ process:'orderBasicData.process',
+ color:'mainIngredient.films',
+ figureNumber:'鍥惧彿',
+ colourCeramicGlaze:'褰╅噳鍥惧彿',
+ glassNumber:"reportingWorks.glassNumber",
+ remarks1:'澶囨敞1',
+ remarks2:'澶囨敞2',
+ remarks3:'澶囨敞3',
+ remarks4:'澶囨敞4',
+ filmNumber:'鑶滃彿'
+
+
+
+
+
+
})
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 5df6a2d..7ae0bf9 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -736,13 +736,25 @@
od.edging_type as edgingType,
p.remarks,
c.customer_abbreviation as customerAbbreviation,
- od.other_columns
+ p.product_abbreviation as productAbbreviation,
+ fc.process_id as processId,
+ o.create_time as createTime,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S02' )) AS figureNumber,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S03' )) AS colourCeramicGlaze,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S04' )) AS remarks1,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S05' )) AS remarks2,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S06' )) AS remarks3,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
+ p.remarks as filmNumber
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
+ left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
--
Gitblit v1.8.0