Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.aps.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @Description : 用于注解不需要进行导入导出的bean对象
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-29
+ * @Modify:
+ **/
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcludeImportExport {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.aps.annotation;
 
-import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.MainKeyValidator;
 
 import javax.validation.Constraint;
@@ -10,6 +9,13 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * @Description : 主键校验注解
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-29
+ * @Modify:
+ **/
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy={MainKeyValidator.class})

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
@@ -29,6 +30,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @MappedSuperclass
 @Api("订单基类")
+@ExcludeImportExport
 public class BaseOrder extends BaseCode {
 
     @Column(name="MATERIAL_ID")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import javax.persistence.MappedSuperclass;
 @EqualsAndHashCode(callSuper = true)
 @MappedSuperclass
 @Api("规则参数基类")
+@ExcludeImportExport
 public class BaseRule extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="规则编码")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
@@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Api("BOM树")
+@ExcludeImportExport
 public class BomTree extends BaseAPS {
 
     @ApiParam(value ="物料类型")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
@@ -32,6 +33,7 @@ import java.sql.JDBCType;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="APS_FIELD_INFO")
 @Api("字段信息")
+@ExcludeImportExport
 public class FieldInfo extends BaseCode {
     @Column(name="CLASS_NAME")
     @ApiParam(value ="所属类简称")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Api("订单树")
+@ExcludeImportExport
 public class OrderTree extends BaseAPS {
     @ApiParam(value ="物料编码")
     private String material;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
@@ -29,6 +30,7 @@ import java.util.List;
 @Entity
 @Table(name = "APS_PARENT_WORK")
 @Api("父工作")
+@ExcludeImportExport
 public class ParentWork extends BaseAPS {
     @Column(name="count")
     @ApiParam(value ="数量")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java

@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_PLAN_FEEDBACK")
-@Api("物料")
+@Api("工作反馈")
 public class PlanFeedback extends BaseAPS {
 
     @Column(name="WORK_ID")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java

@@ -27,7 +27,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_PRODUCT_ROUTING")
-@Api("物料")
+@Api("工艺路线")
 public class ProductRouting extends BaseCode {
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java

@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_PURCHASE_ORDER")
-@Api("工艺路线")
+@Api("采购订单")
 public class PurchaseOrder extends BaseOrder {
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
@@ -26,6 +27,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_RULE_DETAIL")
 @Api("规则明细")
+@ExcludeImportExport
 public class RuleDetail extends BaseAPS {
 
     @Column(name="TYPE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
@@ -26,6 +27,7 @@ import java.util.List;
 @Entity
 @Table(name = "APS_RULE_GROUP")
 @Api("规则组合")
+@ExcludeImportExport
 public class RuleGroup extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -21,7 +22,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_SERIAL_NUMBER")
-@Api("取消计划规则")
+@Api("流水号")
+@ExcludeImportExport
 public class SerialNumber extends BaseAPS {
 
     @Column(name="NUMBER")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.common;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -22,6 +23,7 @@ import java.util.Map;
  **/
 @Data
 @MappedSuperclass
+@ExcludeImportExport
 public abstract class BaseAPS extends BaseBean {
     @JsonIgnore
     private transient Map<String, Object> customFields = new HashMap<>();

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.common;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
@@ -21,6 +22,7 @@ import javax.persistence.MappedSuperclass;
 @EqualsAndHashCode(callSuper = true)
 @MappedSuperclass
 @MainKey(groups = {InsertGroup.class})
+@ExcludeImportExport
 public abstract class BaseCode extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * @Description : 返回给界面的Bean对象信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-29
+ * @Modify:
+ **/
+@Data
+public class BeanModel {
+    private String key;
+    private String name;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -19,5 +19,6 @@ public class GanttCalendarModel {
     private Date end_date;
     private String color;
     private Long id;
+    private Long workId;
     private String text;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class GanttLineModel {
+    private long id;
+    private long source;
+    private long target;
+    private int type;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java

@@ -9,6 +9,6 @@ import javax.validation.ConstraintValidatorContext;
 public class MainKeyValidator implements ConstraintValidator<MainKey, BaseBean> {
     @Override
     public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) {
-        return false;
+        return true;
     }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -446,8 +446,8 @@ public class ApsEnumUtil {
         NONE("NONE", "不限制"),
         NO_PO("NO_PO", "未计划"),
         NO_PLAN("NO_PLAN", "计划完毕"),
-        NO_POR("NO_POR", ""),
-        NO_PPRS("NO_PPRS", "");
+        NO_POR("NO_POR", "指示完毕"),
+        NO_PPRS("NO_PPRS", "已确认");
 
         private String value;
         private String description;