diff --git a/src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java index 9c968ba..396e119 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java @@ -63,5 +63,11 @@ public class TraceManuCodeRelEntity implements Serializable { @TableField(value = "bzcj") private Integer bzcj; + /** + * 生产订单号外键 + */ + @TableField(value = "manuOrderFk") + private Integer manuOrderFk; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/trace/TraceManuOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceManuOrderEntity.java index d34d694..0fd0e04 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceManuOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceManuOrderEntity.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.util.Date; + import lombok.Data; @Data @@ -80,6 +82,14 @@ public class TraceManuOrderEntity implements Serializable { @TableField(value = "updateTime") private Date updateTime; + + /** + * 查询记录号外键 + */ + @TableField(value = "recordCodeFk") + private String recordCodeFk; + + /** * 企业信息ID外键 */ diff --git a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java index 87b03b8..9c149f1 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java @@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.util.Date; + import lombok.Data; /** - * 任务结果表 - */ + * 任务结果表 + */ @Data @TableName(value = "trace_order") public class TraceOrderEntity implements Serializable { @@ -136,6 +138,12 @@ public class TraceOrderEntity implements Serializable { */ @TableField(value = "updateTime") private Date updateTime; + /** + * 查询记录号外键 + */ + @TableField(value = "recordCodeFk") + private String recordCodeFk; + private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4011118..5a82785 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 20