From cac51e7aacded53a855a65d02ea6c57305ea15fe Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 05 七月 2024 09:43:24 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
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 0fb3fac..df699b9 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -459,7 +459,9 @@
od.product_name,
ogd.glass_child,
fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
+ date(fc.splitFrame_time) as splitFrame_time,
+ /* if(fc.print_status=0,'鏈墦鍗�','宸叉墦鍗�') as print_status*/
+ fc.print_status
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -505,7 +507,7 @@
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
- od.remarks
+ concat(od.processing_note,od.remarks) as remarks
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -551,7 +553,8 @@
ogd.glass_child,
e.type_name,
opd.stock_id,
- od.quantity
+ od.quantity,
+ od.other_columns
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -576,7 +579,9 @@
ogd.glass_child,
c.customer_abbreviation as customer_name,
ifnull(od.processing_note,'') as processing_note,
- bgt.type_name
+ bgt.type_name,
+ od.other_columns,
+ od.building_number
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
@@ -686,7 +691,8 @@
od.product_name as productName,
od.edging_type as edgingType,
p.remarks,
- c.customer_abbreviation as customerAbbreviation
+ c.customer_abbreviation as customerAbbreviation,
+ od.other_columns
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
@@ -780,4 +786,9 @@
order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
</select>
+ <update id="updatePrintStateMp">
+ update pp.flow_card
+ set print_status = #{printState}
+ where process_id = #{processId} and technology_number = #{technologyNumber}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0