刘小明
2024-07-23 ec8f519a552206a22806aabdd36a102def1d35f9
id生成,sql优化
3个文件已修改
10 ■■■■■ 已修改文件
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductFile.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrWorkingInstruction.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 {
    /**
     * 
     */
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 {
    /**
     * 
     */
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