From 279b381d288cf6d1358408684d308d50ef3dd7a5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/resources/mapper/BasicParamTemplateMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/mes-basic/src/main/resources/mapper/BasicParamTemplateMapper.xml b/mes-basic/src/main/resources/mapper/BasicParamTemplateMapper.xml
index 619cdac..3cf23a7 100644
--- a/mes-basic/src/main/resources/mapper/BasicParamTemplateMapper.xml
+++ b/mes-basic/src/main/resources/mapper/BasicParamTemplateMapper.xml
@@ -60,7 +60,8 @@
FROM
basic_template
A LEFT JOIN technology_join_operation_template B ON B.technology_template_id = A."id"
- LEFT JOIN plan_manufacturing_order_routing_operation C ON C.operation_id = B.technology_operation_id
+ LEFT JOIN plan_manufacturing_order_rou
+ ting_operation C ON C.operation_id = B.technology_operation_id
LEFT JOIN production_operation_task D ON D.mo_routing_operation_id = C."id"
WHERE D."id" = #{id}
<if test="template.dataType != null and template.dataType != ''">
--
Gitblit v1.9.3