From ec8f519a552206a22806aabdd36a102def1d35f9 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 23 七月 2024 09:19:00 +0800
Subject: [PATCH] id生成,sql优化
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 4 ++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java | 3 ++-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java
index 6e46389..fcfcdba 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import com.dy.common.po.BaseEntity;
import lombok.*;
/**
@@ -20,7 +21,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class PltProductFile implements Serializable {
+public class PltProductFile implements BaseEntity {
/**
*
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java
index a7b6c10..1931abe 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import com.dy.common.po.BaseEntity;
import lombok.*;
/**
@@ -20,7 +21,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class PrWorkingInstruction implements Serializable {
+public class PrWorkingInstruction implements BaseEntity {
/**
*
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index 6bf8a26..408f75b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -52,8 +52,8 @@
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
(
- select * from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
- select * from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
+ select <include refid="Base_Column_List" /> from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
) t
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
--
Gitblit v1.8.0