ERP_override.git

ERP

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2025-02-20 ca83a37c04d4d4029eaffa7a7d11578c26ad74b8

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -2163,7 +2163,8 @@
                      fc.founder,
                      date(fc.splitFrame_time)                                         as splitFrame_time,
                      fc.print_status,
                      processed_part                                                   as process
                      processed_part                                                   as process,
                      merge

               from flow_card as fc
                        left join sd.order_glass_detail as ogd
@@ -2201,7 +2202,8 @@
                      fc.founder,
                      date(fc.splitFrame_time)                                         as splitFrame_time,
                      fc.print_status,
                      processed_part                                                   as process
                      processed_part                                                   as process,
                      merge

               from flow_card as fc
                        left join sd.order_glass_detail as ogd

			@@ -2163,7 +2163,8 @@
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process
			processed_part as process,
			merge

			from flow_card as fc
			left join sd.order_glass_detail as ogd
			@@ -2201,7 +2202,8 @@
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process
			processed_part as process,
			merge

			from flow_card as fc
			left join sd.order_glass_detail as ogd