From 403e47ea5ff962155da8a7e92b1158d787dc0b38 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Tue, 13 Aug 2019 09:08:55 +0800 Subject: [PATCH] =?UTF-8?q?status=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/modules/wms/bd/domain/CustomerInfo.java | 2 +- .../me/zhengjie/modules/wms/bd/domain/IncomeCategory.java | 2 +- .../me/zhengjie/modules/wms/bd/domain/MaterialCategory.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/MaterialInfo.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/MeasureUnit.java | 2 +- .../zhengjie/modules/wms/bd/domain/OutSourceCompanyInfo.java | 2 +- .../me/zhengjie/modules/wms/bd/domain/ProductCategory.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/SpendCategory.java | 2 +- .../me/zhengjie/modules/wms/bd/domain/SupplierCategory.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java | 2 +- .../java/me/zhengjie/modules/wms/bd/domain/WareHouse.java | 4 +--- .../modules/wms/bd/service/impl/MeasureUnitServiceImpl.java | 1 + eladmin-system/src/main/resources/config/application.yml | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/CustomerInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/CustomerInfo.java index b813a357..f204e4a2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/CustomerInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/CustomerInfo.java @@ -58,7 +58,7 @@ public class CustomerInfo implements Serializable { @Column(name = "customer_contact") private String customerContact; - @NotNull +// @NotNull private Boolean status; public void copy(CustomerInfo source){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/IncomeCategory.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/IncomeCategory.java index 0c4ad8fd..99db168f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/IncomeCategory.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/IncomeCategory.java @@ -35,7 +35,7 @@ public class IncomeCategory implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialCategory.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialCategory.java index 6ae50aed..c742da4a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialCategory.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialCategory.java @@ -35,7 +35,7 @@ public class MaterialCategory implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialInfo.java index 55fe3cc0..5722ac41 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MaterialInfo.java @@ -70,7 +70,7 @@ public class MaterialInfo implements Serializable { @Column(name = "material_initial_setup_total_number") private String materialInitialSetupTotalNumber; - @NotNull +// @NotNull private Boolean status; // 创建时间 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MeasureUnit.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MeasureUnit.java index d7134d08..d2a0ed30 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MeasureUnit.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/MeasureUnit.java @@ -34,7 +34,7 @@ public class MeasureUnit implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/OutSourceCompanyInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/OutSourceCompanyInfo.java index 5a021cb5..ea2558f8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/OutSourceCompanyInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/OutSourceCompanyInfo.java @@ -57,7 +57,7 @@ public class OutSourceCompanyInfo implements Serializable { @Column(name = "out_source_company_contact") private String outSourceCompanyContact; - @Column(name = "status") +// @Column(name = "status") private Boolean status; public void copy(OutSourceCompanyInfo source){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductCategory.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductCategory.java index 4b8ec231..7e617f67 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductCategory.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductCategory.java @@ -35,7 +35,7 @@ public class ProductCategory implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java index 4dc5502a..b1fc2c97 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java @@ -74,7 +74,7 @@ public class ProductInfo implements Serializable { @Column(name = "update_time") private Timestamp updateTime; - @NotNull +// @NotNull private Boolean status; public void copy(ProductInfo source){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SpendCategory.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SpendCategory.java index 81c7cdb1..c4d21ed3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SpendCategory.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SpendCategory.java @@ -35,7 +35,7 @@ public class SpendCategory implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierCategory.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierCategory.java index 65b5d1e9..1d254289 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierCategory.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierCategory.java @@ -35,7 +35,7 @@ public class SupplierCategory implements Serializable { @NotBlank private String name; - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java index b787eb20..4e470653 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java @@ -57,7 +57,7 @@ public class SupplierInfo implements Serializable { @Column(name = "supplier_contact") private String supplierContact; - @Column(name = "status") +// @Column(name = "status") private Boolean status; // 供应商类别主键 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/WareHouse.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/WareHouse.java index 75fbfefa..7be422c6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/WareHouse.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/WareHouse.java @@ -43,9 +43,7 @@ public class WareHouse implements Serializable { @NotBlank private String wareHouseCode; - - - @NotNull +// @NotNull private Boolean status; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MeasureUnitServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MeasureUnitServiceImpl.java index c85deb3f..9bed0da1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MeasureUnitServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MeasureUnitServiceImpl.java @@ -34,6 +34,7 @@ public class MeasureUnitServiceImpl implements MeasureUnitService { @Override @Transactional(rollbackFor = Exception.class) public MeasureUnitDTO create(MeasureUnit resources) { + resources.getName(); resources.setStatus(true); return measureUnitMapper.toDto(measureUnitRepository.save(resources)); } diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index e1532fd2..a52de8aa 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8888 spring: profiles: