From a9d859057d0e1d5c4fb080b2fb08c4ed8c1813a5 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 8 Mar 2021 11:58:16 +0700 Subject: [PATCH] penyesuaian entity produk dengan setting not null di database --- .../medifirst2000/entities/Produk.java | 22 ++++++------------- .../jasamedika/medifirst2000/vo/ProdukVO.java | 16 ++------------ 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java index 0190286d..cace6700 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java @@ -12,7 +12,6 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -231,8 +230,7 @@ public class Produk extends BaseMasterProduk { private Integer levelProdukId; @Caption(value = "Kode Produk") - @NotNull(message = "Kd Produk tidak boleh kosong") - @Column(name = "KdProduk", nullable = false, length = 6) + @Column(name = "KdProduk", nullable = true, length = 6) private String kdProduk; @Caption(value = "Spesifikasi") @@ -340,23 +338,19 @@ public class Produk extends BaseMasterProduk { private String kekuatan; @Caption(value = "Nama Produk") - @NotNull(message = "Nama Produk tidak boleh kosong") - @Column(name = "NamaProduk", nullable = false, length = 150) + @Column(name = "NamaProduk", nullable = true, length = 150) private String namaProduk; @Caption(value = "Nilai Normal") - @NotNull(message = "Nilai Normal tidak boleh kosong") - @Column(name = "NilaiNormal", nullable = false) + @Column(name = "NilaiNormal", nullable = true) private short nilaiNormal; @Caption(value = "QProduk") - @NotNull(message = "QProduk tidak boleh kosong") - @Column(name = "QProduk", nullable = false) + @Column(name = "QProduk", nullable = true) private Integer qProduk; @Caption(value = "Qty Jual Terkecil") - @NotNull(message = "Qty Jual Terkecil tidak boleh kosong") - @Column(name = "QtyJualTerkecil", nullable = false) + @Column(name = "QtyJualTerkecil", nullable = true) private Double qtyJualTerkecil; @Caption(value = "Qty Kalori") @@ -380,13 +374,11 @@ public class Produk extends BaseMasterProduk { private Double qtyProtein; @Caption(value = "Qty Satu Kemasan") - @NotNull(message = "Qty Satu Kemasan tidak boleh kosong") - @Column(name = "QtySatuKemasan", nullable = false) + @Column(name = "QtySatuKemasan", nullable = true) private Integer qtySatuKemasan; @Caption(value = "Qty Terkecil") - @NotNull(message = "Qty Terkecil tidak boleh kosong") - @Column(name = "QtyTerkecil", nullable = false) + @Column(name = "QtyTerkecil", nullable = true) private Double qtyTerkecil; @Caption(value = "Tanggal Produksi") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java index bdff9f1d..38ccef25 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java @@ -6,10 +6,8 @@ import javax.persistence.Column; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import com.jasamedika.medifirst2000.entities.BahanSample; import com.jasamedika.medifirst2000.helper.Caption; /** @@ -18,7 +16,7 @@ import com.jasamedika.medifirst2000.helper.Caption; * @author Generator */ public class ProdukVO extends BaseMasterVO { - + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "BahanSampleFk") @Caption(value = "Bahan Sample") @@ -31,8 +29,7 @@ public class ProdukVO extends BaseMasterVO { public void setStrukOrder(BahanSampleVO bahanSample) { this.bahanSample = bahanSample; } - - + @Caption(value = "Deskripsi Produk") @Column(name = "DeskripsiProduk", nullable = true, length = 300) private String deskripsiProduk; @@ -62,7 +59,6 @@ public class ProdukVO extends BaseMasterVO { @ManyToOne @JoinColumn(name = "ObjectDepartemenFk") - @NotNull(message = "Object Departemen Harus Diisi") @Caption(value = "Object Departemen") private DepartemenVO departemen; @@ -73,7 +69,6 @@ public class ProdukVO extends BaseMasterVO { @ManyToOne @JoinColumn(name = "ObjectDetailJenisProdukFk") - @NotNull(message = "Object Detail Jenis Produk Harus Diisi") @Caption(value = "Object Detail Jenis Produk") private DetailJenisProdukVO detailJenisProduk; @@ -111,7 +106,6 @@ public class ProdukVO extends BaseMasterVO { private LevelProdukVO levelProduk; @Caption(value = "Kode Produk") - @NotNull(message = "Kd Produk tidak boleh kosong") @Column(name = "KdProduk", nullable = false, length = 6) private String kdProduk; @@ -164,22 +158,18 @@ public class ProdukVO extends BaseMasterVO { private String kekuatan; @Caption(value = "Nama Produk") - @NotNull(message = "Nama Produk tidak boleh kosong") @Column(name = "NamaProduk", nullable = false, length = 150) private String namaProduk; @Caption(value = "Nilai Normal") - @NotNull(message = "Nilai Normal tidak boleh kosong") @Column(name = "NilaiNormal", nullable = false) private short nilaiNormal; @Caption(value = "QProduk") - @NotNull(message = "QProduk tidak boleh kosong") @Column(name = "QProduk", nullable = false) private Integer qProduk; @Caption(value = "Qty Jual Terkecil") - @NotNull(message = "Qty Jual Terkecil tidak boleh kosong") @Column(name = "QtyJualTerkecil", nullable = false) private Double qtyJualTerkecil; @@ -204,12 +194,10 @@ public class ProdukVO extends BaseMasterVO { private Double qtyProtein; @Caption(value = "Qty Satu Kemasan") - @NotNull(message = "Qty Satu Kemasan tidak boleh kosong") @Column(name = "QtySatuKemasan", nullable = false) private short qtySatuKemasan; @Caption(value = "Qty Terkecil") - @NotNull(message = "Qty Terkecil tidak boleh kosong") @Column(name = "QtyTerkecil", nullable = false) private Double qtyTerkecil;