From 577726818e06b0c135960be8ab02851f1094e9de Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Wed, 22 Oct 2025 14:05:10 +0800 Subject: [PATCH] update --- .../deliveryOrder/entity/DoPickOrderLine.kt | 37 +++++++++++++++++ .../entity/DoPickOrderLineRecord.kt | 39 ++++++++++++++++++ .../entity/DoPickOrderLineRecordRepository.kt | 10 +++++ .../entity/DoPickOrderLineRepository.kt | 11 +++++ .../20251019_02_enson/01_alter_table.sql | 41 +++++++++++++++++++ .../20251022_01_enson/01_alter_table.sql | 8 ++++ 6 files changed, 146 insertions(+) create mode 100644 src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLine.kt create mode 100644 src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecord.kt create mode 100644 src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecordRepository.kt create mode 100644 src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRepository.kt create mode 100644 src/main/resources/db/changelog/changes/20251019_02_enson/01_alter_table.sql create mode 100644 src/main/resources/db/changelog/changes/20251022_01_enson/01_alter_table.sql diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLine.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLine.kt new file mode 100644 index 0000000..c7f160d --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLine.kt @@ -0,0 +1,37 @@ +package com.ffii.fpsms.modules.deliveryOrder.entity + +import com.fasterxml.jackson.annotation.JsonManagedReference +import com.ffii.core.entity.BaseEntity +import com.ffii.fpsms.m18.entity.M18DataLog +import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatus +import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatusConverter +import com.ffii.fpsms.modules.master.entity.Currency +import com.ffii.fpsms.modules.master.entity.Shop +import com.ffii.fpsms.modules.purchaseOrder.entity.PurchaseOrder +import com.ffii.fpsms.modules.user.entity.User +import jakarta.persistence.* +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Size +import java.time.LocalDateTime + +@Entity +@Table(name = "do_pick_order_line") +open class DoPickOrderLine: BaseEntity() { + @Column(name = "do_pick_order_id") + open var doPickOrderId: Long? = null + + @Column(name = "pick_order_id") + open var pickOrderId: Long? = null + + @Column(name = "do_order_id") + open var doOrderId: Long? = null + + @Column(name = "pick_order_code", length = 50) + open var pickOrderCode: String? = null + + @Column(name = "delivery_order_code", length = 50) + open var deliveryOrderCode: String? = null + + @Column(name = "status", length = 20) + open var status: String? = null +} \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecord.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecord.kt new file mode 100644 index 0000000..c9bc76a --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecord.kt @@ -0,0 +1,39 @@ +package com.ffii.fpsms.modules.deliveryOrder.entity + +import com.fasterxml.jackson.annotation.JsonManagedReference +import com.ffii.core.entity.BaseEntity +import com.ffii.fpsms.m18.entity.M18DataLog +import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatus +import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatusConverter +import com.ffii.fpsms.modules.master.entity.Currency +import com.ffii.fpsms.modules.master.entity.Shop +import com.ffii.fpsms.modules.purchaseOrder.entity.PurchaseOrder +import com.ffii.fpsms.modules.user.entity.User +import jakarta.persistence.* +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Size +import java.time.LocalDateTime + +@Entity +@Table(name = "do_pick_order_line_record") +open class DoPickOrderLineRecord: BaseEntity() { + + @Column(name = "do_pick_order_id", length = 100) + open var doPickOrderId: Long? = null + + @JoinColumn(name = "pick_order_id") + open var pickOrderId: Long? = null + + + @JoinColumn(name = "do_order_id") + open var doOrderId: Long? = null + + + @JoinColumn(name = "pick_order_code") + open var pickOrderCode: String? = null + + @Column(name = "delivery_order_code") + open var deliveryOrderCode: String? = null + @Column(name = "status", length = 20) + open var status: String? = null +} \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecordRepository.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecordRepository.kt new file mode 100644 index 0000000..4128bd6 --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRecordRepository.kt @@ -0,0 +1,10 @@ +package com.ffii.fpsms.modules.deliveryOrder.entity + +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository + +@Repository +interface DoPickOrderLineRecordRepository : JpaRepository { + fun findByDoPickOrderIdAndDeletedFalse(doPickOrderId: Long): List + fun findByDoOrderIdAndDeletedFalse(doOrderId: Long): List +} \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRepository.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRepository.kt new file mode 100644 index 0000000..da88734 --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderLineRepository.kt @@ -0,0 +1,11 @@ +package com.ffii.fpsms.modules.deliveryOrder.entity + +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository + +@Repository +interface DoPickOrderLineRepository : JpaRepository { + fun findByDoPickOrderIdAndDeletedFalse(doPickOrderId: Long): List + fun findByDoOrderIdAndDeletedFalse(doOrderId: Long): List + fun findByPickOrderIdAndDeletedFalse(pickOrderId: Long): List +} \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20251019_02_enson/01_alter_table.sql b/src/main/resources/db/changelog/changes/20251019_02_enson/01_alter_table.sql new file mode 100644 index 0000000..ff81e68 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20251019_02_enson/01_alter_table.sql @@ -0,0 +1,41 @@ +-- liquibase formatted sql +-- changeset enson:create_do_pick_order_line_table + +CREATE TABLE `do_pick_order_line` ( + `id` INT NOT NULL AUTO_INCREMENT, + `do_pick_order_id` INT NOT NULL, + `pick_order_id` INT NULL, + `do_order_id` INT NOT NULL, + `pick_order_code` varchar(50) NULL, + `delivery_order_code` varchar(50) NULL, + `created` datetime NULL, + `createdBy` varchar(30) NULL, + `version` int DEFAULT 0, + `modified` datetime NULL, + `modifiedBy` varchar(30) NULL, + `deleted` tinyint(1) DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_do_pick_order_id` (`do_pick_order_id`), + KEY `idx_do_order_id` (`do_order_id`), + KEY `idx_pick_order_id` (`pick_order_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + +CREATE TABLE `do_pick_order_line_record` ( + `id` INT NOT NULL AUTO_INCREMENT, + `do_pick_order_id` INT NOT NULL, + `pick_order_id` INT NULL, + `do_order_id` INT NOT NULL, + `pick_order_code` varchar(50) NULL, + `delivery_order_code` varchar(50) NULL, + `created` datetime NULL, + `createdBy` varchar(30) NULL, + `version` int DEFAULT 0, + `modified` datetime NULL, + `modifiedBy` varchar(30) NULL, + `deleted` tinyint(1) DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_do_pick_order_id` (`do_pick_order_id`), + KEY `idx_do_order_id` (`do_order_id`), + KEY `idx_pick_order_id` (`pick_order_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20251022_01_enson/01_alter_table.sql b/src/main/resources/db/changelog/changes/20251022_01_enson/01_alter_table.sql new file mode 100644 index 0000000..7fdc537 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20251022_01_enson/01_alter_table.sql @@ -0,0 +1,8 @@ +-- liquibase formatted sql +-- changeset enson:create_do_pick_order_line_table + +ALTER TABLE do_pick_order_line_record +ADD COLUMN `status` varchar(50) default 'correct'; + +ALTER TABLE do_pick_order_line +ADD COLUMN `status` varchar(50) default 'correct'; \ No newline at end of file