From 503c45f8fd117ca58d56dcaceb44d8f95b3e2527 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 16 八月 2024 12:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
index 960c554..e24679f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
@@ -16,7 +16,7 @@
round(ogd.child_height) as height,
pd.separation,
fc.technology_number
- from flow_card as fc
+ from pp.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
fc.technology_number = ogd.technology_number
@@ -45,7 +45,7 @@
1 as technologyNumber,
concat(fc.process_id, '/', 1) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
- from flow_card as fc
+ from pp.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
fc.technology_number = ogd.technology_number
--
Gitblit v1.8.0