Переглянути джерело

[data dict] drop job planning log

create_edit_user
cyril.tsui 3 місяці тому
джерело
коміт
6774e3be2f
4 змінених файлів з 14 додано та 77 видалено
  1. +5
    -5
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrder.kt
  2. +0
    -64
      src/main/java/com/ffii/fpsms/modules/jobPlanningLog/entity/JobPlanningLog.kt
  3. +0
    -8
      src/main/java/com/ffii/fpsms/modules/jobPlanningLog/entity/JobPlanningLogRepository.kt
  4. +9
    -0
      src/main/resources/db/changelog/changes/20250527_01_cyril/10_drop_job_planning_log.sql

+ 5
- 5
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrder.kt Переглянути файл

@@ -1,7 +1,6 @@
package com.ffii.fpsms.modules.jobOrder.entity

import com.ffii.core.entity.BaseEntity
import com.ffii.fpsms.modules.jobPlanningLog.entity.JobPlanningLog
import com.ffii.fpsms.modules.master.entity.Bom
import com.ffii.fpsms.modules.user.entity.User
import jakarta.persistence.*
@@ -12,7 +11,7 @@ import java.time.LocalDateTime

@Entity
@Table(name = "job_order")
open class JobOrder: BaseEntity<Long>() {
open class JobOrder : BaseEntity<Long>() {
@Size(max = 100)
@NotNull
@Column(name = "code", nullable = false, length = 100)
@@ -59,7 +58,8 @@ open class JobOrder: BaseEntity<Long>() {
@JoinColumn(name = "approverId", referencedColumnName = "id")
open var approver: User? = null

@ManyToOne
@JoinColumn(name = "jobPlanningLogId")
open var jobPlanningLog: JobPlanningLog? = null
// @ManyToOne
// @JoinColumn(name = "jobPlanningLogId")
@Column(name = "jobPlanningLogId")
open var jobPlanningLogId: Long? = null
}

+ 0
- 64
src/main/java/com/ffii/fpsms/modules/jobPlanningLog/entity/JobPlanningLog.kt Переглянути файл

@@ -1,64 +0,0 @@
package com.ffii.fpsms.modules.jobPlanningLog.entity

import com.ffii.core.entity.BaseEntity
import com.ffii.fpsms.modules.master.entity.Bom
import com.ffii.fpsms.modules.user.entity.User
import jakarta.persistence.*
import jakarta.validation.constraints.NotNull
import jakarta.validation.constraints.Size
import java.math.BigDecimal
import java.time.Instant

@Entity
@Table(name = "job_planning_log")
open class JobPlanningLog: BaseEntity<Long>() {
@Size(max = 100)
@NotNull
@Column(name = "code", nullable = false, length = 100)
open var code: String? = null

@NotNull
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "bomId", nullable = false)
open var bom: Bom? = null

@Column(name = "planStart")
open var planStart: Instant? = null

@Column(name = "actualStart")
open var actualStart: Instant? = null

@Column(name = "planEnd")
open var planEnd: Instant? = null

@Column(name = "actualEnd")
open var actualEnd: Instant? = null

@Column(name = "reqQty", precision = 14, scale = 2)
open var reqQty: BigDecimal? = null

@Column(name = "actualQty", precision = 14, scale = 2)
open var actualQty: BigDecimal? = null

@Size(max = 100)
@NotNull
@Column(name = "status", nullable = false, length = 100)
open var status: String? = null

@Size(max = 500)
@Column(name = "remarks", length = 500)
open var remarks: String? = null

@Size(max = 20)
@NotNull
@Column(name = "type", nullable = false, length = 20)
open var type: String? = null

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "approverId", referencedColumnName = "id")
open var approver: User? = null

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "lastLogId")
open var lastLog: JobPlanningLog? = null
}

+ 0
- 8
src/main/java/com/ffii/fpsms/modules/jobPlanningLog/entity/JobPlanningLogRepository.kt Переглянути файл

@@ -1,8 +0,0 @@
package com.ffii.fpsms.modules.jobPlanningLog.entity

import com.ffii.core.support.AbstractRepository
import org.springframework.stereotype.Repository

@Repository
interface JobPlanningLogRepository : AbstractRepository<JobPlanningLog, Long> {
}

+ 9
- 0
src/main/resources/db/changelog/changes/20250527_01_cyril/10_drop_job_planning_log.sql Переглянути файл

@@ -0,0 +1,9 @@
-- liquibase formatted sql
-- changeset cyril:drop job planning log

ALTER TABLE `job_order`
DROP FOREIGN KEY `FK_JOB_ORDER_ON_JOBPLANNINGLOGID`;
ALTER TABLE `job_order`
DROP INDEX `FK_JOB_ORDER_ON_JOBPLANNINGLOGID` ;

DROP TABLE `job_planning_log`;

Завантаження…
Відмінити
Зберегти