From 64bfbb5013a850b27aaf17ee0fd3e2506f482e1c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Nov 2019 14:25:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E5=B7=A5=E4=BD=9C=E5=9D=97=E8=BF=9E=E7=BA=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/ExcludeImportExport.java | 18 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/annotation/MainKey.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java | 4 +++- .../java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java | 16 ++++++++++++++++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 1 + .../cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java | 11 +++++++++++ .../i3plus/pojo/aps/validator/MainKeyValidator.java | 2 +- .../estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 21 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java new file mode 100644 index 0000000..7e24878 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java index 105400d..565a8b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java +++ b/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}) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 9115264..d569b69 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 3759481..a0f6d02 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/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 ="规则编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java index b8f05fb..122226c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ b/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 ="物料类型") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index ca0c1d9..a93133b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/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 ="所属类简称") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index 493c332..0c6a9a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 1539067..ed4827d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/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 ="数量") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 620ba31..860e0a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index b8b6869..830d392 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/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 ="物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index e12badd..8d11194 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/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 ="指定顶层订单") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 1aa5caa..df02228 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 670f56a..9c126d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/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 ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index 53a30a4..fbe37f0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 1be31d5..18d4ace 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/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 customFields = new HashMap<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index e311e89..03a9bcf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/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 ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java new file mode 100644 index 0000000..a4f0ee1 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 06540a5..3fcd451 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java new file mode 100644 index 0000000..f085c30 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java index 15c92bf..73ba5d0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java +++ b/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 { @Override public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) { - return false; + return true; } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index f5e1d7f..3217940 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/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; From 7004ad09719ddaf666827e81aab918945bd3f697 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 29 Nov 2019 14:31:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/IfRawPartDataModel.java | 2 +- .../i3plus/pojo/mes/model/QcCheckDataModel.java | 116 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 +++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 65b038b..a55a07f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -57,7 +57,7 @@ public class IfRawPartDataModel extends BaseBean { private String supplierCode; @ApiParam("工厂代码") - private String organizationCode; + private String organizeCode; @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java new file mode 100644 index 0000000..d958a07 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\29 11:34 + * @Modify: + **/ +@Data +public class QcCheckDataModel { + + private Long id; + public String organizeCode; + public String createUser; + public String createDatetime; + + @ApiParam("检测id") + private String checkId; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("判定结果") + private String checkResult; + + @ApiParam("产品条码") + private String sn; + + @ApiParam("产品数量") + private Integer qty; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班组") + private String shiftGroupName; + + @ApiParam("班长") + private String squadLeader; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("物料名称") + private String partNoName; + + public QcCheckDataModel() { + + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkId = checkId; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.sn = sn; + this.qty = qty; + this.memo = memo; + this.orderNo = orderNo; + this.custCode = custCode; + this.shiftCode = shiftCode; + this.shiftGroupName = shiftGroupName; + this.squadLeader = squadLeader; + this.workCellName = workCellName; + this.partNoName = partNoName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 23d69d6..ae7e52e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2048,4 +2048,28 @@ public class MesHqlPack { "createDatetime", packBean, true); return packBean; } + + /** + * 物料对象 + * + * @param partObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartObject(MesPartObject partObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partObject, organizeCode); + if (!StringUtils.isEmpty(partObject.getPartNo())) { + DdlPreparedPack.getStringLikerPack(partObject.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectName(), "objectName", packBean); + } + if (!StringUtils.isEmpty(partObject.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } }