From b47f97fa054e1d24c3cee72164ee477237d88828 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 23 Oct 2019 22:39:19 +0800 Subject: [PATCH 01/77] =?UTF-8?q?1050-2=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 1 + .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java | 1 + .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java | 3 +++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index f19880b..dcb2322 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 1704282..ed592b5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN") @Api("产品条码表") -public class MesProduceSn extends BaseBean { +public class MesProduceSn extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index 9c320e4..be9933d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index e6e47f3..3dafd66 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -18,6 +18,8 @@ import java.util.List; @Data public class StationRequestBean implements Serializable { + private static final long serialVersionUID = -8597212451891803174L; + @ApiParam("扫描信息") private String scanInfo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java index 34409f4..6b7eedd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java @@ -7,6 +7,9 @@ import java.io.Serializable; @Data public class StepModel implements Serializable { + + private static final long serialVersionUID = -5772746720347236465L; + @ApiParam("工步代码") private String stepCode; From c56822dc405dd5f8e3b77031e7fd9b61fd437802 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 26 Oct 2019 11:26:24 +0800 Subject: [PATCH 02/77] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201050-5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java index 2d8f0f2..022e20c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index e950b9c..3e61c2a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") From 848f6b2f23f1600caff4a4ae42c5b1f17d2f9f87 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 26 Oct 2019 19:03:09 +0800 Subject: [PATCH 03/77] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201050-6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 5fbb803..41e5a23 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -82,6 +82,9 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + public MesPackage() { + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 9424b33..d3864d0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -23,7 +23,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE_DETAIL") @Api("包装规格") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index bb74b3e..6beeba3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -28,7 +28,6 @@ import javax.persistence.Transient; @Api("PLC配置表") public class MesPlc extends BaseBean { - @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -65,6 +64,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 79eb8f3..1dd0077 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -66,6 +66,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; From 5183163abdf6d3260303444e9a5361126810c1dd Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 28 Oct 2019 14:24:30 +0800 Subject: [PATCH 04/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=AF=B9=E8=B1=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 3 +++ 4 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 6a0a0d2..eddecd7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -21,4 +21,5 @@ public @interface FieldAnnotation { int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 + boolean popSearch() default false; // 弹出选择对象时是否显示 } 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 f302131..aedbbcd 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 @@ -44,6 +44,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="类型名称") private String typeName; + @Column(name="TYPE_FULL_NAME") + @ApiParam(value ="类型全名称包含路径") + private String typeFullName; + @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") private Boolean customize; @@ -84,6 +88,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @Column(name="POP_SEARCH") + @ApiParam(value ="弹出选择时是否显示") + private Boolean popSearch; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 70f77de..261164e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,4 +30,9 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组id") + @FieldAnnotation(display = false) + private Long ruleGroupId; } 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 b434092..0cb563a 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.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true) private String code; @Column(name="NAME") @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) private String name; @Column(name="REMARK") From 7496eb4a1b16f55950c76cd669681e285af2b1b8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 28 Oct 2019 16:09:57 +0800 Subject: [PATCH 05/77] =?UTF-8?q?LAC=20=E5=85=A8=E9=83=A8=20CRUD=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 78 ++++++++++++++ .../pojo/lac/bean/LacCommandStackStepTask.java | 102 ++++++++++++++++++ .../pojo/lac/bean/LacCommandStackTemplate.java | 80 ++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 91 ++++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 116 +++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacSuitTaskParam.java | 90 ++++++++++++++++ .../pojo/lac/bean/LacSuitTaskParamAdapter.java | 100 ++++++++++++++++++ .../repository/LacCommandStackStepRepository.java | 14 +++ .../LacCommandStackStepTaskRepository.java | 14 +++ .../LacCommandStackTemplateRepository.java | 14 +++ .../pojo/lac/repository/LacSuitCaseRepository.java | 15 +++ .../LacSuitTaskParamAdapterRepository.java | 14 +++ .../lac/repository/LacSuitTaskParamRepository.java | 14 +++ .../pojo/lac/repository/LacSuitTaskRepository.java | 14 +++ 14 files changed, 756 insertions(+) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java new file mode 100644 index 0000000..84fb49f --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStep( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepName varchar(50) null, + *
stepSort int null, + *
stepExecCond double null, + *
stepDescription varchar(255) null + *
); + * + *
comment on table LacInstructionSetStep is'指令集模板步骤'; + *
comment on column LacInstructionSetStep.templateId is'模板id'; + *
comment on column LacInstructionSetStep.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStep.templateCode is'模板代码'; + *
comment on column LacInstructionSetStep.stepName is'步骤名称'; + *
comment on column LacInstructionSetStep.stepSort is'步骤顺序'; + *
comment on column LacInstructionSetStep.stepExecCond is'步骤执行条件'; + *
comment on column LacInstructionSetStep.stepDescription is'步骤描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackStep extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="STEP_NAME") + @ApiParam(value ="模板名称") + private String stepName; + + @Column(name="STEP_CODE") + @ApiParam(value ="模板代码") + private String stepCode; + + @Column(name="STEP_SORT") + @ApiParam(value ="步骤顺序") + private Integer stepSort; + + @Column(name="STEP_EXEC_COND") + @ApiParam(value ="步骤执行条件") + private Integer stepExecCond; + + @Column(name="STEP_DESCRIPTION") + @ApiParam(value ="步骤执行条件") + private String stepDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java new file mode 100644 index 0000000..a0aac59 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStepTask( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepId bigint null, + *
stepNameRdd varchar(50) null, + *
taskId bigint null, + *
taskNameRdd varchar(50) null, + *
taskCode varchar(50) null, + *
isCrux int null + *
); + * + *
comment on table LacInstructionSetStepTask is'指令集模板步骤任务'; + *
comment on column LacInstructionSetStepTask.templateId is'模板id'; + *
comment on column LacInstructionSetStepTask.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStepTask.templateCode is'模板代码'; + *
comment on column LacInstructionSetStepTask.stepId is'步骤id'; + *
comment on column LacInstructionSetStepTask.stepNameRdd is'步骤名称'; + *
comment on column LacInstructionSetStepTask.taskId is'任务id'; + *
comment on column LacInstructionSetStepTask.taskNameRdd is'任务名称'; + *
comment on column LacInstructionSetStepTask.taskCode is'任务代码'; + *
comment on column LacInstructionSetStepTask.isCrux is'是否关键'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP_TASK") +@Api(value="步骤任务",description = "步骤任务信息") +public class LacCommandStackStepTask extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称") +// private String templateNameRdd; +// +// @Column(name="TEMPLATE_CODE_RDD") +// @ApiParam(value ="模板代码") +// private String templateCodeRdd; + + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; +// +// @Column(name="STEP_NAME_RDD") +// @ApiParam(value ="步骤名称") +// private String stepNameRdd; +// +// @Column(name="STEP_CODE_RDD") +// @ApiParam(value ="步骤代码") +// private String stepCodeRdd; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String taskNameRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + + @Column(name="IS_CRUX") + @ApiParam(value ="是否关键") + private Integer isCrux; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java new file mode 100644 index 0000000..11ff867 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table instructionSetTemplate( + *
templateName varchar(50) null, + *
templateCode varchar(50) null, + *
templateTypeId bigint null, + *
templateTypeNameRdd varchar(50) null, + *
templateDescription varchar(50) null, + *
templateStepNum int null + *
); + * + *
comment on table instructionSetTemplate is'指令集模板'; + *
comment on column instructionSetTemplate.templateName is'模板名称'; + *
comment on column instructionSetTemplate.templateCode is'模板代码'; + *
comment on column instructionSetTemplate.templateTypeId is'模板大类id'; + *
comment on column instructionSetTemplate.templateTypeNameRdd is'模板大类名称'; + *
comment on column instructionSetTemplate.templateDescription is'模板描述'; + *
comment on column instructionSetTemplate.templateStepNum is'模板步骤'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_TEMPLATE") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackTemplate extends BaseBean { + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long stackTypeId; + + @Column(name="STACK_TYPE_NAME_RDD") + @ApiParam(value ="类型名称") + private String stackTypeNameRdd; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="模板大类名称") + private String typeDescription; + + @Column(name="TEMPLATE_NUM") + @ApiParam(value ="适配器使用数量") + private Integer templateNum; + + @Column(name="TEMPLATE_DESCRIPTION") + @ApiParam(value ="模板描述") + private String templateDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java new file mode 100644 index 0000000..af6e6fb --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitCase( + *
sutiCaseId bigint null, + *
sutiCaseNameRdd varchar(50) null, + *
suitCaseCode varchar(50) null, + *
sutiType int null, + *
hardwareType int null, + *
returnMethod int null, + *
timeout int null, + *
retryNum int null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
sutiCaseStatus int null + *
); + *
+ *
comment on table LacSuitCase is'适配器'; + *
comment on column LacSuitCase.sutiCaseId is'适配器id'; 不推荐使用ID绑定，数据库调整会有变动，推荐使用Code 绑定 + *
comment on column LacSuitCase.sutiCaseNameRdd is'适配器名称'; + *
comment on column LacSuitCase.suitCaseCode is'适配器代码'; + *
comment on column LacSuitCase.sutiType is'适配器类型（枚举）'; + *
comment on column LacSuitCase.hardwareType is'硬件类型（枚举）'; + *
comment on column LacSuitCase.returnMethod is'返回方式（枚举）'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.successNum is'成功次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.failNum is'失败次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.countNum is'总次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.sutiCaseStatus is'适配器状态'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_CASE") +@Api(value="适配器",description = "适配器信息") +public class LacSuitCase extends BaseBean { + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String sutiCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="SUTI_TYPE") + @ApiParam(value ="适配器类型") + private Integer sutiType; + + @Column(name="HARDWARE_TYPE") + @ApiParam(value ="硬件类型") + private Integer hardwareType; + + @Column(name="RETURN_METHOD") + @ApiParam(value ="返回类型") + private Integer returnMethod; + + @Column(name="SUTI_CASE_STATUS") + @ApiParam(value ="适配器状态") + private Integer sutiCaseStatus; + + @Column(name="SUIT_CASE_DESCRIPTION") + @ApiParam(value ="适配器描述") + private String suitCaseDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java new file mode 100644 index 0000000..d9af1a4 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTask( + *
taskName varchar(50) null, + *
taskCode varchar(50) null, + *
taskTypeId bigint null, + *
taskTypeNameRdd varchar(50) null, + *
suitCaseId bigint null, + *
suitCaseCode varchar(50) null, + *
suitCaseNameRdd varchar(50) null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
taskDescription varchar(255) null + *
); + *
comment on table LacSuitTask is'适配任务'; + *
comment on column LacSuitTask.taskName is'任务名称'; + *
comment on column LacSuitTask.taskCode is'任务代码'; + *
comment on column LacSuitTask.taskTypeId is'任务大类id'; + *
comment on column LacSuitTask.taskTypeNameRdd is'任务大类名称'; + *
comment on column LacSuitTask.suitCaseId is'适配器id'; + *
comment on column LacSuitTask.suitCaseCode is'适配器代码'; + *
comment on column LacSuitTask.suitCaseNameRdd is'适配器名称'; + *
comment on column LacSuitTask.successNum is'成功次数'; + *
comment on column LacSuitTask.failNum is'适配次数'; + *
comment on column LacSuitTask.countNum is'总次数'; + *
comment on column LacSuitTask.taskDescription is'任务描述'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK") +@Api(value="调度任务",description = "调度任务信息") +public class LacSuitTask extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="适配器名称") + private String taskName; + + @Column(name="TASK_CODE") + @ApiParam(value ="适配器代码") + private String taskCode; + + @Column(name="TASK_TIMEOUT") + @ApiParam(value ="超时时间") + private Integer taskTimeout; + + @Column(name="TASK_RETRY_NUM") + @ApiParam(value ="重试次数") + private Integer taskRetryNum; + + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型名称") + private String taskTypeNameRdd; + + @Column(name="SUIT_CASE_ID") + @ApiParam(value ="适配器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String suitCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="NUM_SUCCESS") + @ApiParam(value ="执行成功次数") + private Integer numSuccess = 0; + + @Column(name="NUM_FAIL") + @ApiParam(value ="执行失败次数") + private Integer numFail = 0; + + @Column(name="NUM_COUNT") + @ApiParam(value ="执行次数") + private Integer numCount = 0; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="任务描述") + private String taskDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java new file mode 100644 index 0000000..2b4b3af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParam( + *
suitTaskId bigint null, + *
suitTaskName varchar(50) null, + *
suitTaskCode varchar(50) null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
paramDescrition varchar(255) null + *
); + *
comment on table LacSuitTaskParam is'适配任务参数'; + *
comment on column LacSuitTaskParam.suitTaskId is'适配任务id'; + *
comment on column LacSuitTaskParam.suitTaskName is'适配任务名称'; + *
comment on column LacSuitTaskParam.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParam.paramName is'参数名称'; + *
comment on column LacSuitTaskParam.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParam.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParam.defaultValue is'默认值'; + *
comment on column LacSuitTaskParam.paramDescrition is'参数描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM") +@Api(value="调度任务参数",description = "调度任务参数信息") +public class LacSuitTaskParam extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_CODE") + @ApiParam(value ="参数编码") + private String paramCode; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="PARAM_DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String paramDefaultValue; + + @Column(name="PARAM_DESCRIPTION") + @ApiParam(value ="参数描述") + private String paramDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java new file mode 100644 index 0000000..b44528b --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParamAdapter( + *
sutiTaskId bigint null, + *
suitTaskCode varchar(50) null, + *
suitTaskNameRdd varchar(50) null, + *
paramId bigint null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
transferParamName varchar(50) null, + *
transferParamValueType int null + *
); + *
comment on table LacSuitTaskParamAdapter is'适配任务参数转换'; + *
comment on column LacSuitTaskParamAdapter.sutiTaskId is'适配任务id'; + *
comment on column LacSuitTaskParamAdapter.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'适配任务名称'; + *
comment on column LacSuitTaskParamAdapter.paramId is'参数id'; + *
comment on column LacSuitTaskParamAdapter.paramName is'参数名称'; + *
comment on column LacSuitTaskParamAdapter.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.defaultValue is'默认值'; + *
comment on column LacSuitTaskParamAdapter.transferParamName is'转换后参数名称'; + *
comment on column LacSuitTaskParamAdapter.transferParamValueType is'转换后参数值类型'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午1:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM_ADAPTER") +@Api(value="调度任务参数转换",description = "调度任务参数转换信息") +public class LacSuitTaskParamAdapter extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="TRANSFER_PARAM_NAME") + @ApiParam(value ="转换后参数名称") + private String transferParamName; + + @Column(name="TRANSFER_PARAM_VALUE_TYPE") + @ApiParam(value ="转换后参数值类型") + private String transferParamValueType; + + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java new file mode 100644 index 0000000..8df6834 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java new file mode 100644 index 0000000..4db8217 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java new file mode 100644 index 0000000..6aa60e8 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacCommandStackTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java new file mode 100644 index 0000000..c4d52d5 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitCase; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacSuitCaseRepository extends BaseRepository { +} + diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java new file mode 100644 index 0000000..887c5b6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamAdapterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java new file mode 100644 index 0000000..d1026e0 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java new file mode 100644 index 0000000..c65e6c7 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskRepository extends BaseRepository { +} From 803d5c57f2579651c8adc474dd3ee959f9ff2fb7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 28 Oct 2019 17:45:13 +0800 Subject: [PATCH 06/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=821101=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A=EF=BC=8C?= =?UTF-8?q?=E7=AC=AC3=E6=AC=A1=E6=8F=90=E4=BA=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 1928952..c8316cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -50,5 +50,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("关闭按钮-提醒") private boolean closeButtonNoticeFlag; + @ApiParam("维修任务按钮") + private boolean repairButton; + } From d99ad6c44a55c149c390ac8496dba38070094e12 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 28 Oct 2019 19:28:19 +0800 Subject: [PATCH 07/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=AF=B9=E8=B1=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 3 +++ .../cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 3 +++ .../cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 3 +++ .../java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 3 +++ .../java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 3 +++ .../java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 17 +++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 5 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 2 +- 13 files changed, 74 insertions(+), 1 deletion(-) 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 12c9683..dd36fb7 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 @@ -32,6 +32,7 @@ public class BaseOrder extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @Column(name="LET") @@ -40,18 +41,22 @@ public class BaseOrder extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时刻计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时刻计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="RECEIVE_DATE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 89699c0..97056fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -33,10 +34,12 @@ public class Inventory extends BaseOrder { @Column(name="ASSIGN_COUNT") @ApiParam(value ="已分配量") + @FieldAnnotation(modify = false) private Double assignCount; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 23bcbe8..a006cdf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -77,14 +77,17 @@ public class ProductOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="LACK_COUNT") @ApiParam(value ="缺少量") + @FieldAnnotation(modify = false) private Double lackCount; @Column(name="AUTO_SUPPLY") 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 eab91d2..f784093 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -41,10 +42,12 @@ public class PurchaseOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="AUTO_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index e74a116..dc63b89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,6 +43,7 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 896eb83..5e68d01 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -31,10 +31,12 @@ import java.util.List; public class Work extends BaseCode { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") + @FieldAnnotation(modify = false) private WORK_TYPE workType; @Column(name="count") @ApiParam(value ="数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="SPECIFY_COUNT") @@ -75,10 +77,12 @@ public class Work extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时间计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时间计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="WORK_STATUS") @@ -87,14 +91,17 @@ public class Work extends BaseCode { @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始时间") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束时间") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="PLAN_RESOURCE") @ApiParam(value ="计划主资源") + @FieldAnnotation(modify = false) private String planResource; @Column(name="FIX_SPLIT") @@ -103,14 +110,17 @@ public class Work extends BaseCode { @Column(name="NEED_PREV_COUNT") @ApiParam(value ="需要的前工作数量") + @FieldAnnotation(display = false, modify = false) private Double needPrevCount; @Column(name="SCH_FAILED") @ApiParam(value ="是否排程失败") + @FieldAnnotation(modify = false) private Boolean schFailed; @Column(name="FAILED_REASON") @ApiParam(value ="排程失败原因") + @FieldAnnotation(modify = false) private String failedReason; @Column(name="ORDER_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index c74f140..e690ba2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,14 +29,17 @@ import java.util.List; public class WorkInput extends BaseAPS { @Column(name="INPUT_TIME") @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) private Date inputTime; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") + @FieldAnnotation(modify = false) private Double inputCount; @Column(name="SHORT_COUNT") @ApiParam(value ="短缺数量") + @FieldAnnotation(modify = false) private Double shortCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 49116dd..c947efd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -30,14 +30,17 @@ import java.util.List; public class WorkOutput extends BaseAPS { @Column(name="OUTPUT_TIME") @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) private Date outputTime; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") + @FieldAnnotation(modify = false) private Double outputCount; @Column(name="REMAIN_COUNT") @ApiParam(value ="多余数量") + @FieldAnnotation(modify = false) private Double remainCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 95b5a20..ddd9a92 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; @@ -34,66 +35,82 @@ import java.util.List; public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") + @FieldAnnotation(modify = false) private Date prevSetBegin; @Column(name="PREV_SET_END") @ApiParam(value ="前设置结束时间") + @FieldAnnotation(modify = false) private Date prevSetEnd; @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") + @FieldAnnotation(modify = false) private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") + @FieldAnnotation(modify = false) private Date produceEnd; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") + @FieldAnnotation(modify = false) private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") + @FieldAnnotation(modify = false) private Date postSetBegin; @Column(name="POST_SET_END") @ApiParam(value ="后设置结束时间") + @FieldAnnotation(modify = false) private Date postSetEnd; @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") + @FieldAnnotation(modify = false) private Date lockBegin; @Column(name="LOCK_END") @ApiParam(value ="锁定结束时间") + @FieldAnnotation(modify = false) private Date lockEnd; @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") + @FieldAnnotation(modify = false) private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") + @FieldAnnotation(property = false) private Long workId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源对象id") + @FieldAnnotation(property = false) private Long resourceId; @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") + @FieldAnnotation(property = false) private Long workResourceId; @Column(name="MAIN_PLAN_ID") @ApiParam(value ="主计划对象id") + @FieldAnnotation(property = false) private Long mainPlanId; public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 8894581..e4d86da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -29,22 +29,27 @@ import javax.persistence.Table; public class WorkRelation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="关联类型") + @FieldAnnotation(modify = false) private WORK_RELATION_TYPE type; @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") + @FieldAnnotation(modify = false) private CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大间隔时间") + @FieldAnnotation(modify = false) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小间隔时间") + @FieldAnnotation(modify = false) private String minSpaceTime; @Column(name="COUNT") @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="FIX_RELATION") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f4266ec..f51f6b1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -28,38 +28,47 @@ import javax.persistence.Table; public class WorkResource extends BaseAPS { @Column(name="USE_TYPE") @ApiParam(value ="使用类型") + @FieldAnnotation(modify = false) private USE_TYPE useType; @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Long prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") + @FieldAnnotation(modify = false) private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Long postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(modify = false) private Integer priority; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(modify = false) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") + @FieldAnnotation(modify = false) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(modify = false) private String maxPostSdTime; @Column(name="USER_MATCH_NUMBER") @ApiParam(value ="资源使用配套号") + @FieldAnnotation(modify = false) private String userMatchNumber; @Column(name="WORK_ID") 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 e61ce60..a300c90 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,10 +1,14 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import java.util.HashMap; import java.util.Map; @@ -22,6 +26,12 @@ public abstract class BaseAPS extends BaseBean { @JsonIgnore private transient Map customFields = new HashMap<>(); + @Column(name="KEY") + @ApiParam(value ="主键值") + @FieldAnnotation(display = false, modify = false) + @Transient + private String key; + public Object getCustomField(String code) { return customFields.get(code); } 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 0cb563a..5d03f34 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 @@ -19,7 +19,7 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") - @FieldAnnotation(popSearch = true) + @FieldAnnotation(popSearch = true, mainkey = true) private String code; @Column(name="NAME") From a5609d97fbc57788b42018da3bb538d8df958733 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 28 Oct 2019 21:12:40 +0800 Subject: [PATCH 08/77] =?UTF-8?q?=E3=80=901092=20=E8=BF=94=E5=8E=82?= =?UTF-8?q?=E8=BF=94=E4=BF=AE=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 8 +++ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 11 ++++ 3 files changed, 92 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index c6a96dc..0b2d4a4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,79 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes 工位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_TYPE { + + NORMAL(10, "正常"), + REWORK(20, "返修"); + + private int value; + private String description; + + MES_WORK_CELL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 物料绑定记录结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PRODUCE_SN_RESULT { + + OK(10, "OK"); + + private int value; + private String description; + + MES_PRODUCE_SN_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes缺陷原因类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 9dfa3d0..a03c46a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -95,6 +95,14 @@ public class MesProcessBom extends BaseBean { @ApiParam("显示颜色") private String color; + @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 09fd0cd..4047e39 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,4 +73,15 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + 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.partName = partName; + } } From 6de6d36e809009dceb63380e4b8db75dc9f33463 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 28 Oct 2019 21:22:36 +0800 Subject: [PATCH 09/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E5=8F=8D=E5=86=99=201105-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 25 +++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 13 ----------- .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 24 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 14 ------------ 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index 1c9c4b8d2..015d53e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; @@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index c9f59b0..645c2d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c788f8a..debf5a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index e616922..b294abe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; From 13066bd4d1e184039dcfcb65c6d2818b191dddcf Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Tue, 29 Oct 2019 09:46:15 +0800 Subject: [PATCH 10/77] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E3=80=91bug=20243?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8af7dae..c905237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -182,11 +182,12 @@ public class WmsPart extends BaseBean { public WmsPart() { } - public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) { + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; this.partName = partName; this.max = maxQty; this.min = minQty; this.qty = cqty; + this.partType = partType; } } From 3f6f6428f63a76496ca6e93458513d2443452ff1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 29 Oct 2019 09:50:51 +0800 Subject: [PATCH 11/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82:1106,?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=9A=E7=9F=A5=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 0882b81..b018ee8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象值") private String notifyObjectValue; + @Column(name="NOTIFY_OBJECT_VALUE_RDD") + @ApiParam("对象值") + private String notifyObjectValueRdd; + @Column(name="NOTIFY_OBJECT_TYPE") @ApiParam("对象类型") private Integer notifyObjectType; 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 6887621..33494dc 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 @@ -1454,8 +1454,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) { DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean); } - if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) { - DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean); + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean); } if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) { DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean); From 88af19f8e9b4e5df3a9108e97790097291c5d6c3 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 29 Oct 2019 11:11:08 +0800 Subject: [PATCH 12/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83pom=E6=96=87=E4=BB=B6test=E4=B8=BAdev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4426ba9..b6adafd 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 6c22c39..7f12b9c 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f220aa1..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From b8842edbb110ef267b26d636310e7530a617bb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 29 Oct 2019 11:33:02 +0800 Subject: [PATCH 13/77] =?UTF-8?q?=E6=97=A0=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=EF=BC=9A=E6=96=B0=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 76aad42..0a90db5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -185,6 +185,10 @@ public class WmsMoveDetails extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam(value = "车号") + private String carNo; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -225,12 +229,14 @@ public class WmsMoveDetails extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.unit = unit; this.transQty = transQty; } + public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; From c79786a67759916011a1cc7f74cd5e35c4f224fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 29 Oct 2019 15:04:25 +0800 Subject: [PATCH 14/77] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81POM=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=A2=AB=E6=94=B9=E6=88=90DEV=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9B=9ETEST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b6adafd..4426ba9 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7f12b9c..6c22c39 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 5b712ce774a8865386107826495e35af1ff42416 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Oct 2019 15:17:33 +0800 Subject: [PATCH 15/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 3 ++ .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 ++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 3 ++ .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 5 ++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 34 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/common/DateDuration.java | 6 ++-- .../cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java | 28 ++++++++++++++++++ .../i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java | 14 +++++++++ 9 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index eddecd7..2d099f0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.annotation; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -22,4 +24,5 @@ public @interface FieldAnnotation { boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 boolean popSearch() default false; // 弹出选择对象时是否显示 + EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型 } 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 aedbbcd..ea3296d 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,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -92,6 +93,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="弹出选择时是否显示") private Boolean popSearch; + @Column(name="EDIT_TYPE") + @ApiParam(value ="字段编辑类型") + private EDIT_TYPE editType; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 46880ed..7b7ba76 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -70,7 +70,7 @@ public class Material extends BaseCode { @Column(name="LEVEL") @ApiParam(value ="低阶码") - @RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel") + @RippleAnnotation(dependence = {"OperInputs.Operation.ProductRouting.Material.level"}, method = "calcLevel") @FieldAnnotation(modify = false) private Integer level; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 2ec0cbc..d1bb335 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -27,6 +29,7 @@ import java.util.List; public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") + @FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT) private String resCodes; @Column(name="WEEKS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 261164e..4f68bf4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.ROUTING_VALID_TYPE; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,6 +32,10 @@ public class SysParam extends BaseAPS { @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + @Column(name="TYPE") + @ApiParam(value ="工艺路径有效判断类型") + private ROUTING_VALID_TYPE type; + @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组id") @FieldAnnotation(display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 86df02c..4a5e2a9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -400,4 +400,38 @@ public class BeanRelation { recursionImpl(relaBean, fun, holders, index + 1); } } + + /** + * 判断target是否为bean为起点的以holders路径上的点。 + * @param bean + * @param target + * @param holders + * @return + */ + public static boolean recursionContains(BaseBean bean, BaseBean target, Enum... holders) { + if (holders.length == 0) { + return false; + } + + return recursionContainsImpl(bean, target, holders, 0); + } + + private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target, + Enum[] holders, int index) { + if (index >= holders.length) { + if (target == bean) { + return true; + } + index = 0; + } + + List relaBeans = list(bean, holders[index]); + for (BaseBean relaBean : relaBeans) { + if (recursionContainsImpl(relaBean, target, holders, index + 1)) { + return true; + } + } + + return false; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index af5476a..68b2fd5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,7 +25,7 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private long time = 0; + private int time = 0; private double rate = 0.0; private boolean bValid = false; @@ -60,7 +60,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public long getTime() { + public int getTime() { return this.time; } @@ -68,7 +68,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(long time) { + public void setTime(int time) { this.time = time; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java new file mode 100644 index 0000000..b231839 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :字段的编辑类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum EDIT_TYPE { + NONE, + BOOLEAN, // 布尔, 开关编辑 + CHAR, // 字符, 文本框编辑 + SHORT, // 短整型, 数字编辑 + INTEGER, // 整型, 数字编辑 + LONG, // 长整型, 数字编辑 + DOUBLE, // 浮点型, 文本框编辑 + DATE, // 日期类型(2019-09-16) + TIME, // 时间类型(17:35:30) + DATE_TIME, // 日期时间类型(2019-09-16 17:35:30) + DURATION, // 时间段(1H),文本框编辑 + ENUM, // 枚举,下拉选择 + MULTI_ENUM, // 多选枚举， 下拉多选 + STRING, // 字符串，文本框编辑 + OBJECT, // 关联对象，下来选择关联对象的Code值 + LIST, // 对象集合，不可编辑。 + MULTI_OBJECT // 多选对象，弹出框选择，可以选择全部对象，以*表示选择全部 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java new file mode 100644 index 0000000..47f2580 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工艺路径有效性判断类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-29 + * @Modify: + **/ +public enum ROUTING_VALID_TYPE { + ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较 + CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较 + BASE_TIME // 与基准时刻做比较 +} From bc13a8a3accb4757a8dcca07881c64ec30e7ce1a Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 29 Oct 2019 17:52:41 +0800 Subject: [PATCH 16/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1090?= =?UTF-8?q?=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 +++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 4 ++ .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 4 ++ .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 -- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 32 +++++++++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 60 +++++++++++++++++ 7 files changed, 213 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 856f7c2..8403580 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesScrap 报废原因 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + + SCRAP_TYPE(10, "过期"), + SCRAP_TYPE2(20, "不合格"), + SCRAP_TYPE3(30, "缺失"); + + private int value; + private String description; + + SCRAP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes 图片面位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 0b2d4a4..c7a0b65 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -12,6 +12,82 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesPcnEnumUtil { + + /** + * MesScrap 报废原因 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + + SCRAP_TYPE(10, "过期"), + SCRAP_TYPE2(20, "不合格"), + SCRAP_TYPE3(30, "缺失"); + + private int value; + private String description; + + SCRAP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_QC_STATUS { + + QUALIFIED(10, "合格"), + DEFECTED(20, "不合格"), + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); + + private int value; + private String description; + + PRODUCE_SN_QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * mes 工位类型 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 53f4b36..30c641c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -53,6 +53,10 @@ public class MesDefectRecord extends BaseBean { @ApiParam("缺陷位置") private String defectLocation; + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + @Column(name="REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java index cad4af5..c42611a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java @@ -36,4 +36,8 @@ public class MesScrap extends BaseBean { @ApiParam("报废名称") private String scrapName; + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + private String scrapType; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index 2c60f7a..46b20b1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -60,10 +60,6 @@ public class MesScrapRecord extends BaseBean { @ApiParam("工位") private String workCellCode; - @Column(name = "SCRAP_REASON") - @ApiParam("报废原因") - private String scrapReason; - @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index aaa7497..8736abb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -36,6 +36,16 @@ public class MesProdBindRecordModel { private Integer missQty; @ApiParam("报废数") private Integer scrapQty; + @ApiParam("创建时间") + private String createUser; + @ApiParam("创建时间") + private String createDatetime; + @ApiParam("修改人") + private String modifyUser; + @ApiParam("修改时间") + private String modifyDatetime; + @ApiParam("产品条码") + private String serialNumber; public MesProdBindRecordModel() { } @@ -72,4 +82,26 @@ public class MesProdBindRecordModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index c9a071a..82ef884 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -220,4 +220,64 @@ public class MesHqlPack { return packBean; } + /** + * MES PCN系维修信息条件查询 + * + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (mesRepair.getRepairType() != null) { + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (StringUtils.isNotEmpty(mesScrap.getScrapType())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); + } + return packBean; + } + + /** + * MES PCN缺陷原因信息条件查询 + * + * @param mesDefectCause + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (mesDefectCause.getDcType() != null) { + DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } + } From 794bbc4fbaf5e04fac4808012fa09e9137aa81cc Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Oct 2019 18:10:20 +0800 Subject: [PATCH 17/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 2 +- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 33 +++++++++++++++++++--- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 2d099f0..1eb5b9d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -25,4 +25,5 @@ public @interface FieldAnnotation { String defaultValue() default ""; // 字段的默认值 boolean popSearch() default false; // 弹出选择对象时是否显示 EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型 + String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index d1bb335..125255d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -29,7 +29,7 @@ import java.util.List; public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") - @FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT) + @FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource") private String resCodes; @Column(name="WEEKS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 4a5e2a9..17cc18a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; @@ -235,6 +232,34 @@ public class BeanRelation { return index == 0 && bNotLast; } + /** + * 获取关联对象集合，排除重复的对象 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ + public static Set listUnique(BaseBean bean, Enum holder, Enum... args) { + Set result = new HashSet<>(); + List nextBeans = list(bean, holder); + for (BaseBean nextBean : nextBeans) { + listUniqueImpl(result, nextBean, args, 0); + } + result.remove(bean); + return result; + } + + private static void listUniqueImpl(Set result, BaseBean bean, Enum[] holders, int index) { + if (index >= holders.length) { + result.add((T)bean); + } else { + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + listUniqueImpl(result, nextBean, holders, index + 1); + } + } + } /** From 95789b1bd89ca201e76857f5692c63483a65a2a8 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 29 Oct 2019 18:36:34 +0800 Subject: [PATCH 18/77] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=83=85=E5=86=B5BI=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/NormalityModel.java | 23 ++++++++++++ .../estsh/i3plus/pojo/mes/model/XrSampleModel.java | 43 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalityModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XrSampleModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalityModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalityModel.java new file mode 100644 index 0000000..ddb7232 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalityModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 正态分布处理Model + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-28 + * @Modify: + **/ +@Data +public class NormalityModel { + @ApiParam("节点") + double node; + @ApiParam("发生频次") + int times; + @ApiParam("开始节点") + double from; + @ApiParam("结束节点") + double to; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XrSampleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XrSampleModel.java new file mode 100644 index 0000000..f1c9cad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XrSampleModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 均值极差样本数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-28 + * @Modify: + **/ +@Data +public class XrSampleModel { + @ApiParam("样本数量") + private int sampleCount; + @ApiParam("样本组数") + private int groupCount; + @ApiParam("每组个数") + private int preGroupCount; + @ApiParam("A2值") + private double a2; + @ApiParam("D3值") + private double d3; + @ApiParam("D4值") + private double d4; + + @ApiParam("均值平均数") + private double xAver; + @ApiParam("均值控制上限") + private double xUcl; + @ApiParam("均值控制下限") + private double xLcl; + @ApiParam("极差平均数") + private double rAver; + @ApiParam("极差控制上限") + private double rUcl; + @ApiParam("极差控制下限") + private double rLcl; + +} From b05711dc6cf6f14c30070aea3a9a802381bed91d Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Oct 2019 20:52:31 +0800 Subject: [PATCH 19/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java | 5 +++-- .../main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java | 5 ++--- .../main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java | 7 +++++++ 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index ddd9a92..db9b0b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import io.swagger.annotations.Api; @@ -33,6 +34,11 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { + @Column(name="TYPE") + @ApiParam(value ="工作计划类型") + @FieldAnnotation(modify = false, display = false) + private WORK_PLAN_TYPE type; + @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") @FieldAnnotation(modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java index 3402810..d78c393 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java @@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum RESOURCE_CLASS { - MAIN, // 主资源 - ASS // 副资源 + LIMITLESS, // 无限能力 + SINGLE, // 单能力 + BATCH // 炉资源 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java index a42c74c..fa18826 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java @@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum RESOURCE_TYPE { - LIMITLESS, // 无限能力 - SINGLE, // 单能力 - BATCH // 炉资源 + MAIN, // 主资源 + ASS // 副资源 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java new file mode 100644 index 0000000..2a3afa2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_PLAN_TYPE { + MAIN_PLAN, // 主资源计划 + ASS_PLAN, // 副资源计划 + BATCH_PLAN // 炉资源计划 +} From dcaf007f4db4eea0cdd2508749f103da2e68fdee Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 09:44:11 +0800 Subject: [PATCH 20/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1107?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 8 ++++- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 6 ++-- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 12 ++++++++ .../mes/pcn/repository/MesFiCfgRepository.java | 17 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 ++++- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 6 ++-- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 12 ++++++++ .../pojo/mes/repository/MesFiCfgRepository.java | 17 ++++++++++ 11 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8403580..439677b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -49,6 +49,42 @@ public class MesEnumUtil { } /** + * 条码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PRODUCE_SN_TYPE { + + NORMAL(10, "正常件"), + FIRST_INSPECTION(20, "首检件"); + + private int value; + private String description; + + MES_PRODUCE_SN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes 图片面位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java index b450200..7df328e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 1704282..ff3d432 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") - private String snType; + private Integer snType; @Column(name = "TRAY") @ApiParam("托盘号") @@ -149,6 +149,10 @@ public class MesProduceSn extends BaseBean { return this.printStatus == null ? 0 : this.printStatus; } + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + @Override public String toString() { return "MesProduceSn{" + @@ -172,6 +176,8 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", packageSn='" + packageSn + '\'' + + ", snType='" + snType + '\'' + + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + '}'; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 82024e9..c6a9f8e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private Long fiQty; + private Double fiQty; @Column(name = "FI_COMPLETE_QTY") @ApiParam("首检完成数量") - private Long fiCompleteQty; + private Double fiCompleteQty; @Column(name = "FI_GENERATE_QTY") @ApiParam("首检生成数量") - private Long fiGenerateQty; + private Double fiGenerateQty; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index d51705d..616096a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..0050530 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index f141d6d..0ee50ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 773d6ce..fa582cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam("条码类型") - private String snType; + private Integer snType; @Column(name = "TRAY") @ApiParam("托盘号") @@ -145,6 +145,10 @@ public class MesProduceSn extends BaseBean { return this.printStatus == null ? 0 : this.printStatus; } + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + @Override public String toString() { return "MesProduceSn{" + @@ -168,6 +172,8 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", packageSn='" + packageSn + '\'' + + ", snType='" + snType + '\'' + + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + '}'; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 13037ce..864d687 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; @Column(name = "FI_COMPLETE_QTY") @ApiParam("首检完成数量") - private String fiCompleteQty; + private Double fiCompleteQty; @Column(name = "FI_GENERATE_QTY") @ApiParam("首检生成数量") - private String fiGenerateQty; + private Double fiGenerateQty; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 8145bd4..f3c006d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..85077f4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} From 0011a4bc56870ecac1acee54020eee3b2f8a8221 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 30 Oct 2019 10:42:35 +0800 Subject: [PATCH 21/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1089?= =?UTF-8?q?=20=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 26bccb6..7d03fcd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean { private String custCode; @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient @ApiParam("过程质量检测数据") private List mesQcCheckStandardList; From 2f382d37ccf545640d72c849fa902cf81f375363 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 11:37:42 +0800 Subject: [PATCH 22/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1124?= =?UTF-8?q?=EF=BC=8C=E9=A6=96=E6=A3=80=E4=BB=B6=E9=85=8D=E7=BD=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 33494dc..38beffe 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 @@ -1553,4 +1553,24 @@ public class MesHqlPack { } return packBean; } + + /** + * 按条件分页查询首检件配置信息 + * @param mesFiCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesFiCfg(MesFiCfg mesFiCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesFiCfg, organizeCode); + if (!StringUtils.isEmpty(mesFiCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesFiCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesFiCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesFiCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesFiCfg.getCustCode())) { + DdlPreparedPack.getStringLikerPack(mesFiCfg.getCustCode(), "custCode", packBean); + } + return packBean; + } } From 1357dfad305f66e80a4f8a40474ebc715f9908f6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Oct 2019 16:00:11 +0800 Subject: [PATCH 23/77] =?UTF-8?q?=E3=80=90VDA=E6=94=B6=E8=B4=A7--=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFPC=E7=AB=AFPOsn=E9=A1=B5=E3=80=91=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=B71102=20=E3=80=90VDA=E6=94=B6=E8=B4=A7--=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=B8=AD=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E3=80=91=E4=BB=BB=E5=8A=A1=E5=8F=B71104=20?= =?UTF-8?q?=E3=80=90VDA=E6=94=B6=E8=B4=A7--=20=E7=B3=BB=E7=BB=9F=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B=E4=BF=9D=E8=B4=A8=E6=9C=9F=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=9A=84=E5=85=B7=E4=BD=93=E4=BF=A1=E6=81=AF=E3=80=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=B71112=20=E3=80=90VDA=E6=94=B6?= =?UTF-8?q?=E8=B4=A7--=20=E5=AF=B9=E4=BA=8E=E5=88=86=E7=BB=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A6=82=E4=BD=95=E6=9F=A5=E7=9C=8B=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=91=E4=BB=BB=E5=8A=A1=E5=8F=B71111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 4aaec5c..72b1248 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -89,6 +89,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "收货数量", example = "0") public Double recQty; + @Column(name = "ERP_AREA_NO_ADD") + @ApiParam("默认收货库存地") + private String erpAreaNoAdd; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b1e3261..c4c545d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -262,6 +262,14 @@ public class WmsStockSn extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("临保天数") + private String qualityDay; + + @Transient + @ApiParam("筛选（>=）或<") + private String choose; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d30e639..dd901c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -889,6 +889,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), @@ -1509,6 +1511,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result); @@ -1964,6 +1967,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); From aeff042046f35d790a7e5fd8d6e19c4abb6e421c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 29 Oct 2019 10:37:04 +0800 Subject: [PATCH 24/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index d61b983..6f69f3d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -171,6 +171,7 @@ public class UserDetailModel extends BaseBean { user.setUserPhone(this.userPhone); user.setUserLoginPassword(this.userLoginPassword); user.setLanguageCode(this.userLanguageCode); + user.setOrganizeCode(this.organizeCode); return user; } @@ -204,6 +205,7 @@ public class UserDetailModel extends BaseBean { info.setUserPoliticalStatus(this.infoPoliticalStatus); info.setUserGrade(this.infoGrade); info.setUserEmployeeType(this.infoEmployeeType); + info.setOrganizeCode(this.organizeCode); return info; } From f67a61ec926c4e925664b9a8ff31b1d9cdb6ce3f Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 30 Oct 2019 16:27:01 +0800 Subject: [PATCH 25/77] =?UTF-8?q?=E7=BD=91=E5=85=B3=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20APS=20=E8=B7=AF=E7=94=B1=20BASE=20URL=20=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 8f92da4..a2e6054 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -33,6 +33,7 @@ public class CommonEnumUtil { HARDSWITCH(25,"block-hardswitch","硬件适配器"), LAC(26,"lac","连接适配器"), ANDON(27,"andon","安灯"), + APS(28,"APS","高级计划与排程"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), CLOUD(97,"i3cloud","微服务"), From 2069d6a3aef0f39cf5154c7dfee54aa36687625a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 17:00:32 +0800 Subject: [PATCH 26/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1125?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 39 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 31 +++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 439677b..2a5c20c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 设备台账报表查询标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQUIPMENT_REPORT_TYPE { + + TASK(10, "作业任务"), + PLAN(20, "周期计划"), + REPAIR(30, "维修记录"), + CHECK(40, "点检记录"), + MAINTAIN(50, "保养记录"); + + private int value; + private String description; + + EQUIPMENT_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesScrap 报废原因 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 38beffe..deb4a29 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 @@ -1573,4 +1573,35 @@ public class MesHqlPack { } return packBean; } + + /** + * 维修记录 + * @param mesEquTaskRepairRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode); + if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * 点检或保养记录 + * @param mesEquTaskStandardRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode); + if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean); + } + return packBean; + } } From 6c847cf3052ef3fa845bec3d0b1b3c4b525f8249 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 30 Oct 2019 18:43:13 +0800 Subject: [PATCH 27/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1091?= =?UTF-8?q?=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 12 +++++++ .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 4 +-- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 4 +++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 14 +++++++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 +++ .../estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 6 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 +-- 9 files changed, 84 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 439677b..fca2eb0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesRepair 处理措施 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_TYPE { + + SCRATCH(10, "划痕"), + FRACTURE(20, "破碎"), + DEFECT(30, "缺失"); + + private int value; + private String description; + + MES_REPAIR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesScrap 报废原因 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index eb67cfc..3c28582 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PICTURE_NAME") @ApiParam("图片名称") private String pictureName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name = "FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index ff3d432..4f2ba05 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -62,11 +62,11 @@ public class MesProduceSn extends BaseBean { private Integer printStatus; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") + @ApiParam("工位") private String workCellCode; @Column(name = "ROUTE_CODE") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index 0590a17..ae8b814 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 445c18d..ae64067 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCtgyCode; + private String produceCategoryCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") @@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PICTURE_NAME") @ApiParam("图片名称") private String pictureName; + + @Column(name = "FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name = "FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name = "FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index fa582cd..eba28bd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -121,6 +121,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("托盘号") private String tray; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index dee99d3..b00e8b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index b4a23a6..2d5ffd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Transient; /** * @Description: @@ -60,4 +62,8 @@ public class ProdOrgModel extends BaseBean { @ApiParam("当前级") private Integer level; + + @Transient + @ApiParam("工位类型") + private Integer workCellType; } 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 33494dc..e4f9c9f 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 @@ -1428,8 +1428,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode); - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean); } if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) { DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean); From 347c47c82fc853117d7a632385f3018e51365e8d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 20:42:00 +0800 Subject: [PATCH 28/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1125?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index dfd7e1b..b15b610 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -83,4 +83,8 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam(value = "处理方法") private String fmCode; + @Transient + @ApiParam(value = "任务类型") + private Integer taskType; + } From 6a1990a215b14b34712d499670a36ded381d0429 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 31 Oct 2019 11:45:33 +0800 Subject: [PATCH 29/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 ++++ .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 47 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 6 +-- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 2 +- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 4 +- .../estsh/i3plus/pojo/aps/holders/EResource.java | 1 + .../aps/repository/ShippingTimeRepository.java | 9 +++++ .../src/main/resources/relations/Resource.xml | 2 + .../src/main/resources/relations/WorkPlan.xml | 2 - 10 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 2a95d89..1e4576f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EResource; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +15,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :资源 @@ -96,4 +100,7 @@ public class Resource extends BaseCode { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") private String lockTime; + + @JsonBackReference + public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java new file mode 100644 index 0000000..9e637b2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :运输时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_SHIPPING_TIME") +@Api("运输时间") +public class ShippingTime extends BaseAPS { + @Column(name="PREV_RES_CODE") + @ApiParam(value ="前资源编码") + private String prevResCode; + + @Column(name="POST_RES_CODE") + @ApiParam(value ="后资源编码") + private String postResCode; + + @Column(name="PREV_STAND_CODE") + @ApiParam(value ="前标准工序编码") + private String prevStandCode; + + @Column(name="POST_STAND_CODE") + @ApiParam(value ="后标准工序编码") + private String postStandCode; + + @Column(name="TIME") + @ApiParam(value ="运输时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private Integer priority; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index db9b0b4..d034238 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE; @@ -57,6 +58,8 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin", + "PrevPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @@ -87,6 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin") private Date lockBegin; @Column(name="LOCK_END") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f51f6b1..638b6e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,17 +34,17 @@ public class WorkResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") @FieldAnnotation(modify = false) - private Long prevTime; + private Integer prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") @FieldAnnotation(modify = false) - private Long produceTime; + private Integer produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @FieldAnnotation(modify = false) - private Long postTime; + private Integer postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 17cc18a..700a1cf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -48,7 +48,7 @@ public class BeanRelation { return result; } for (Enum holder : beanInfo.getAllHolders()) { - result.put(holder, new ArrayList<>()); + result.put(holder, new LinkedList<>()); } return result; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 68b2fd5..2760736 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -139,12 +139,12 @@ public class DateDuration { * @param amount * @return */ - public long getTime(double amount) { + public int getTime(double amount) { if (amount < PRECISION) return getTime(); double result = (amount * this.rate) + this.time; - return (long)Math.ceil(result); + return (int)Math.ceil(result); } /** diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 175536d..c72c61e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,4 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { + WorkPlans } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java new file mode 100644 index 0000000..a4dda7b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ShippingTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ShippingTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 81c9f49..c2123bc 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 7569fa1..c47bdad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,7 +1,5 @@ - - From 75ce77f6f1637483d5dbc56fdaea9305ef36ff5c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 31 Oct 2019 13:06:59 +0800 Subject: [PATCH 30/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1126?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 44f04ba..89d70d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -53,6 +53,10 @@ public class MesEquTaskPlan extends BaseBean { @ApiParam("创建提前天数") private Integer daysInAdvance; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + @Transient @ApiParam(value = "生产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index 3464fb4..d3ece07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -28,6 +28,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("创建提前天数") private Integer daysInAdvance; + @ApiParam("备注") + private String memo; + @ApiParam("生产线") private String workCenterCode; @@ -66,7 +69,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -74,6 +77,7 @@ public class MesEquTaskPlanModel implements Serializable { this.taskCycle = taskCycle; this.lastTime = lastTime; this.daysInAdvance = daysInAdvance; + this.memo = memo; this.workCenterCode = workCenterCode; this.equipmentCategory = equipmentCategory; this.organizeCode = organizeCode; From b112bdb5e8c63dcbbceb2c27ef4f30b3ed5306b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 31 Oct 2019 13:52:00 +0800 Subject: [PATCH 31/77] =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=86=99=E5=85=A5MOVE=5FTO=5FERP?= =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=B7+=E8=A1=8C=E5=8F=B7+=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=AF=E5=90=A6=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=98=AF=E5=88=99=E5=B0=86=E6=AD=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=87=E8=AE=B0=E4=B8=BA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=94=E6=97=A0=E6=95=88=E8=BD=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 66fbc2b..654dbd2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -26,6 +26,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_TO_ERP", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO") }) From 7799937093eabfd969c6bea87c418f9ff1edae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 31 Oct 2019 13:52:55 +0800 Subject: [PATCH 32/77] =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=86=99=E5=85=A5MOVE=5FTO=5FERP?= =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=B7+=E8=A1=8C=E5=8F=B7+=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=AF=E5=90=A6=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=98=AF=E5=88=99=E5=B0=86=E6=AD=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=87=E8=AE=B0=E4=B8=BA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=94=E6=97=A0=E6=95=88=E8=BD=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 63 +++++++++++++++++----- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9546754..437f39a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -25,7 +25,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_CHECK { DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"), - NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单"); + NO_CHECK(3, "不校验"), CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单"); private int value; private String description; @@ -285,6 +285,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -860,7 +861,7 @@ public class WmsEnumUtil { return null; } else { for (int i = 0; i < values().length; i++) { - if (StringUtils.equalsIgnoreCase(values()[i].value,value)) { + if (StringUtils.equalsIgnoreCase(values()[i].value, value)) { return values()[i]; } } @@ -917,7 +918,7 @@ public class WmsEnumUtil { INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成"), - CANCEL(50,"CANCEL","撤销"); + CANCEL(50, "CANCEL", "撤销"); private int value; private String code; @@ -1098,7 +1099,7 @@ public class WmsEnumUtil { MONTH_INVENTORY(20, "月度盘点"), SEASON_INVENTORY(30, "季度盘点"), YEAR_INVENTORY(40, "年度盘点"), - AJUST_INVENTORY(50, "库存调整盘点"); + AJUST_INVENTORY(50, "库存调整盘点"); private int value; private String description; @@ -3435,12 +3436,13 @@ public class WmsEnumUtil { * 收货状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REC_STATUS{ + public enum REC_STATUS { UNRECEIVED("UNRECEIVED", "未收货"), COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), - OTHER("ELSE", "其他"),; + OTHER("ELSE", "其他"), + ; private String value; private String description; @@ -3476,7 +3478,7 @@ public class WmsEnumUtil { public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val) ) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3523,7 +3525,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ETC_PRINT_STATUS { - NOT_HIT (10, "未打"), + NOT_HIT(10, "未打"), ALREADY_HIT(20, "已打"); private int value; @@ -3681,8 +3683,8 @@ public class WmsEnumUtil { public enum ROUTING_RULE_MODE { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), - MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + MENU_OPT(30, "MENU_OPT", "手工操作"), + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); private int value; private String code; private String description; @@ -3729,13 +3731,14 @@ public class WmsEnumUtil { return tmp; } } + /** * 物流规则 处理模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTING_RULE_TYPE { - PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"), - REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则"); + PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"), + REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则"); private int value; private String code; private String description; @@ -3782,12 +3785,13 @@ public class WmsEnumUtil { return tmp; } } + /** * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTING_DELAY_UNIT { - M(10, "M", "分"), + M(10, "M", "分"), D(20, "D", "天"); private int value; private String code; @@ -3836,4 +3840,37 @@ public class WmsEnumUtil { } } + /** + * MOVE_TO_ERP表是否同步 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_TO_ERP_IS_SYNC { + SYNCHRONIZED(1, "已同步"), UN_SYNCHRONIZED(2, "未同步"), NON_SYNCHRONIZED(3, "不同步"); + + private int value; + private String description; + + MOVE_TO_ERP_IS_SYNC(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file From 6fd7e6be5f307436a712d58c3d4aa6f4196c073d Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 31 Oct 2019 13:59:35 +0800 Subject: [PATCH 33/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1092?= =?UTF-8?q?=20=E7=BB=B4=E4=BF=AE=E7=B1=BB=E5=9E=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 2775754..ea4b34b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -83,4 +84,7 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") private String memo; + + @Transient + private String serialNumber; } 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 f2bad26..afc0963 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 @@ -459,7 +459,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } if (mesRepair.getRepairType() != null) { - DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + DdlPreparedPack.getStringEqualPack(mesRepair.getRepairType(), "repairType", packBean); } if (mesRepair.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean); From 9907813aed1a5256655c2b1d757a577d7ec067a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 31 Oct 2019 14:12:26 +0800 Subject: [PATCH 34/77] =?UTF-8?q?Lac=E8=B0=83=E5=BA=A6=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 1 - .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 179 +++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 10 +- .../pojo/lac/bean/LacCommandStackStepTask.java | 6 +- .../pojo/lac/bean/LacCommandStackTemplate.java | 6 +- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 17 ++ .../i3plus/pojo/lac/bean/LacSuitTaskParam.java | 5 + .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 23 ++- .../estsh/i3plus/pojo/mes/bean/MesDatasource.java | 2 +- modules/i3plus-pojo-model/pom.xml | 7 + .../pojo/model/lac/LacCommandStackModel.java | 59 +++++++ .../i3plus/pojo/model/lac/LacSuitRequest.java | 28 ++++ .../i3plus/pojo/model/lac/LacSuitResponse.java | 37 +++++ .../java/cn/estsh/i3plus/pojo/model/lac/Task.java | 21 +++ .../cn/estsh/i3plus/pojo/model/lac/TaskParam.java | 24 +++ pom.xml | 6 + 16 files changed, 418 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 3b43308..fdd5391 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -862,6 +862,5 @@ public class BlockSoftSwitchEnumUtil { } return null; } - } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java new file mode 100644 index 0000000..85262b4 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -0,0 +1,179 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 13:37 + * @Modify: + **/ +public class LacEnumUtil { + + /** + * 适配器类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_CASE_TYPE { + SOFTWARE(10, "软件"), + HARDWARE(20, "硬件"); + + private int value; + private String description; + + private SUIT_CASE_TYPE (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static LacEnumUtil.SUIT_CASE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * 硬件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HARDWARE_TYPE { + OPC_READ(10, "读OPC"), + OPC_WRITE(20, "写OPC"); + + private int value; + private String description; + + private HARDWARE_TYPE (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static LacEnumUtil.HARDWARE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * 参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_TYPE{ + OUT_PARAM(1,"出参"), + IN_PARAM(2,"入参"); + + private int value; + private String description; + + PARAM_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 指令集状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STACK_STATUS{ + RUNNING(1,"运行中"), + PAUSE(2,"暂停"), + FINISH(3,"完成"); + + private int value; + private String description; + + STACK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static boolean isRunning(int val) { + return RUNNING.getValue() == val; + } + } + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 84fb49f..cbe2d05 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -9,10 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -47,7 +48,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="LAC_COMMAND_STACK_STEP") -@Api(value="指令集模板",description = "指令集模板信息") +@Api(value="指令集步骤",description = "指令集步骤") public class LacCommandStackStep extends BaseBean { @Column(name="TEMPLATE_ID") @@ -69,10 +70,13 @@ public class LacCommandStackStep extends BaseBean { @Column(name="STEP_EXEC_COND") @ApiParam(value ="步骤执行条件") - private Integer stepExecCond; + private Double stepExecCond; @Column(name="STEP_DESCRIPTION") @ApiParam(value ="步骤执行条件") private String stepDescription; + @Transient + @ApiParam(value ="步骤任务列表") + private List stepTaskList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index a0aac59..df9848e 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -67,7 +68,6 @@ public class LacCommandStackStepTask extends BaseBean { // @ApiParam(value ="模板代码") // private String templateCodeRdd; - @Column(name="STEP_ID") @ApiParam(value ="步骤ID") @JsonSerialize(using = ToStringSerializer.class) @@ -94,9 +94,11 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="任务代码") private String taskCodeRdd; - @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; + @Transient + @ApiParam(value ="适配任务") + private LacSuitTask lacSuitTask; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java index 11ff867..7f301fa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -9,10 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -77,4 +78,7 @@ public class LacCommandStackTemplate extends BaseBean { @ApiParam(value ="模板描述") private String templateDescription; + @Transient + @ApiParam(value ="步骤列表") + private List stepList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index d9af1a4..f32fa91 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -113,4 +115,19 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="任务描述") private String taskDescription; + @Transient + @ApiParam(value ="适配套件") + private LacSuitCase lacSuitCase; + + @Transient + @ApiParam(value ="适配参数") + private List lacSuitTaskParamList; + + @Transient + @ApiParam(value ="入参适配") + private List inputParamAdapterList; + + @Transient + @ApiParam(value ="出参适配") + private List outputParamAdapterList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 2b4b3af..cb0905e 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -87,4 +88,8 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_DESCRIPTION") @ApiParam(value ="参数描述") private String paramDescription; + + @Transient + @ApiParam(value ="参数值") + private Object value; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 2c5dbff..d147827 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.lac.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.lac.bean.*; /** @@ -15,33 +17,44 @@ public class LacHqlPack { private LacHqlPack() { } - public static DdlPackBean packHqlLacTaskType(LacTaskType bean){ + public static DdlPackBean packHqlLacTaskType(LacTaskType bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){ + public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacLogTask(LacLogTask bean){ + public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){ + public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){ + public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } + + public static DdlPackBean packHqlLacCommandStackStepByTemplateId(Long templateId) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(templateId, "templateId", ddlPackBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{"stepSort"}, + ddlPackBean + ); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index c5da050..ebe9d58 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -60,7 +60,7 @@ public class MesDatasource extends BaseBean { @ApiParam("设备代码") private String equipmentCode; - @Column(name = "DS_DB_NAME") + @Column(name = "DS_DB_NAMsE") @ApiParam("数据库名称") private String dsDbName; diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7f12b9c..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -43,15 +43,22 @@ i3plus.pojo i3plus-pojo-wms + i3plus.pojo i3plus-pojo-form + i3plus.pojo i3plus-pojo-softswitch + + i3plus.pojo + i3plus-pojo-lac + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java new file mode 100644 index 0000000..f0bb101 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; +import lombok.Data; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @Description : lac指令集model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:29 + * @Modify: + **/ +@Data +public class LacCommandStackModel { + + /** + * 指令集记录id + */ + private Long recordId; + + /** + * 指令集模板 + */ + @Deprecated + private LacCommandStackTemplate commandStackTemplate; + + /** + * 指令集记录 + */ + private LacCommandStackRecord commandStackRecord; + + /** + * 请求数据 + */ + private LacSuitRequest request; + + /** + * 响应数据 + */ + private LacSuitResponse response; + + /** + * 任务原始报文 + * key : 任务编号 + * value ： 原始报文 + */ + private Map orginMessage = new ConcurrentHashMap<>(); + + /** + * 任务转换后报文 + * key : 任务编号 + * value ： 转换后报文 + */ + private Map transMessage = new ConcurrentHashMap<>(); + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java new file mode 100644 index 0000000..75964e5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; +import java.util.List; + +/** + * @Description : lac 适配请求信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:07 + * @Modify: + **/ +@Data +@XStreamAlias("request") +public class LacSuitRequest { + + /** + * 指令集代码 + */ + private String commandStackCode; + + /** + * 参数集合 + */ + private List taskList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java new file mode 100644 index 0000000..9c4a0bc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +/** + * @Description : lac 适配响应信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:07 + * @Modify: + **/ +@Data +@XStreamAlias("response") +public class LacSuitResponse { + + /** + * 是否成功 + */ + private boolean success; + + /** + * 状态码 + */ + private String code; + + /** + * 状态信息 + */ + private String message; + + /** + * 返回数据 + */ + private Object result; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java new file mode 100644 index 0000000..3ea6970 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 17:06 + * @Modify: + **/ +@Data +@XStreamAlias("task") +public class Task { + + private String code; + + private List paramList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java new file mode 100644 index 0000000..40bc9c6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamConverter; +import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:10 + * @Modify: + **/ +@Data +@XStreamAlias("param") +@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"}) +public class TaskParam { + + private String name; + + private String value; + +} diff --git a/pom.xml b/pom.xml index f355cca..0b2c3eb 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-lac + ${project.version} + + com.fasterxml.jackson.core From 4b66ec0e87e1d263ba31f62c3fb2120aadb0a35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 31 Oct 2019 14:14:37 +0800 Subject: [PATCH 35/77] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=9E=E4=BE=8Bid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index df9848e..08f791e 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -72,6 +72,11 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="步骤ID") @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + + @Column(name="TASK_INSTANCE_ID") + @ApiParam(value ="任务实例ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskInstanceId; // // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") From 4dcbcf068ac6b6d2040cf867fd00ae623ba55b76 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 31 Oct 2019 16:41:14 +0800 Subject: [PATCH 36/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1090?= =?UTF-8?q?=20=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index 3c28582..f148413 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -44,10 +44,6 @@ public class MesProduceCtgyPicture extends BaseBean { @ApiParam("图片名称") private String pictureName; - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("FILE_ORIGIN_NAME") - private String fileOriginName; - @Column(name = "FILE_SIZE") @ApiParam("FILE_SIZE") private String fileSize; @@ -55,4 +51,8 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "FILE_TYPE_ID") @ApiParam("FILE_TYPE_ID") private String fileTypeId; + + @Column(name = "FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; } From 69be00297253bfdb9fb02e65c351e83698616dfc Mon Sep 17 00:00:00 2001 From: lpx Date: Thu, 31 Oct 2019 16:41:59 +0800 Subject: [PATCH 37/77] =?UTF-8?q?=E3=80=90=E8=A3=85=E7=AE=B1=E9=98=B2?= =?UTF-8?q?=E9=94=99=E3=80=91=E3=80=90301-4.2=E6=9D=A1=E7=A0=81=E8=A3=85?= =?UTF-8?q?=E7=AE=B1=E9=98=B2=E9=94=99=E3=80=91=E3=80=901118=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A3=85=E7=AE=B1=E9=98=B2=E9=94=99=E5=BB=BA=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 437f39a..f9ea404 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -800,7 +800,8 @@ public class WmsEnumUtil { VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), - VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"); + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), + VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"); private String value; private String description; @@ -3562,7 +3563,8 @@ public class WmsEnumUtil { public enum PART_ASSOCIATE_TYPE { LINE(10, "LINE", "产线"), CUSTOMER(20, "CUSTOMER", "客户"), - VENDOR(30, "VENDOR", "供应商"); + VENDOR(30, "VENDOR", "供应商"), + BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错"); private int value; private String code; @@ -3873,4 +3875,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 防错类型： + * 10=零件装箱防错，20=条码装箱防错，30=BMW标签防错，40=BMW零件防错，50=BMW发运防错，60=单件发运防错 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_BOXING_ERROR_PROOFING_TYPE { + PART_NO(10, "零件装箱防错"), + SN(20, "条码装箱防错"), + BMW_TAG(30, "BMW标签防错"), + BMW_PART(40, "BMW零件防错"), + BMW_DISPATCH(50, "BMW发运防错"), + SINGLE_DISPATCH(60, "单件发运防错"); + + private int value; + private String description; + + PART_BOXING_ERROR_PROOFING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file From cb319e4304ff34783e0c54e40e4fa95974dc7e05 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 31 Oct 2019 17:36:58 +0800 Subject: [PATCH 38/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1126?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 21 +++++++++++++++++++++ .../pojo/mes/bean/MesEquTaskStandardRecord.java | 12 ++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index f5720a9..1ffe9c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :设备维修作业记录 @@ -65,4 +66,24 @@ public class MesEquTaskRepairRecord extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("故障现象") + private String fpName; + + @Transient + @ApiParam("故障原因") + private String fcName; + + @Transient + @ApiParam("处理方法") + private String fmName; + + @Transient + @ApiParam("作业类型") + private String taskTypeName; + + @Transient + @ApiParam("整体结果") + private String finalResultName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 82bb4aa..41d7209 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -74,4 +74,16 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("作业类型") + private String taskTypeName; + + @Transient + @ApiParam("整体结果") + private String finalResultName; + + @Transient + @ApiParam("判定结果") + private String checkResultName; + } From 828cf667848d7016fc56b2fa1b139159495a8130 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 31 Oct 2019 19:57:47 +0800 Subject: [PATCH 39/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1090?= =?UTF-8?q?=20=E5=B7=A5=E5=BA=8FBOM=EF=BC=8C=E7=89=A9=E6=96=99=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 4 ---- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 4 ---- .../cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 6 +++--- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index b319f6c..fc5e745 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -885,15 +885,15 @@ public class MesEnumUtil { * pcn 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_IS_KEY { + public enum MES_IS_BIND_KEY { - IS_KEY(10, "是"), - NO_KEY(20, "否"); + IS_BIND_KEY(1, "是"), + NO_BIND_KEY(2, "否"); private int value; private String description; - MES_IS_KEY(int value, String description) { + MES_IS_BIND_KEY(int value, String description) { this.value = value; this.description = description; } @@ -907,8 +907,8 @@ public class MesEnumUtil { } // 根据value返回枚举类型,主要在switch中使用 - public static MES_IS_KEY getByValue(int value) { - for (MES_IS_KEY mesInsertExcel : values()) { + public static MES_IS_BIND_KEY getByValue(int value) { + for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { return mesInsertExcel; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index a03c46a..c4dfe04 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -83,10 +83,6 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; - @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index abb7861..13e4804 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -85,9 +85,9 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index c89db3f..a01c774 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -87,10 +87,6 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; - @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 3d5b323..f689f22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -86,9 +86,9 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private String isKey; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") From 50bf9300ba4cfa3bd72167bce39edfc15b07fd99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 31 Oct 2019 20:09:58 +0800 Subject: [PATCH 40/77] =?UTF-8?q?LAC=20=E8=B0=83=E5=BA=A6=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/lac/bean/LacCommandStackRecord.java | 7 ++- .../pojo/lac/bean/LacCommandStackStepTask.java | 1 - .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 8 ++++ .../pojo/model/lac/LacCommandStackModel.java | 52 ++++++++++++++++++---- .../i3plus/pojo/model/lac/LacSuitResponse.java | 7 +++ 5 files changed, 64 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index 7a42440..eea1bf4 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -9,11 +9,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -92,4 +93,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; + @Transient + @ApiParam(value ="步骤列表") + private List stepList; + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 08f791e..b1d8a30 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -102,7 +102,6 @@ public class LacCommandStackStepTask extends BaseBean { @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; - @Transient @ApiParam(value ="适配任务") private LacSuitTask lacSuitTask; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index f32fa91..1b2c71a 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -73,6 +73,10 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="超时时间") private Integer taskTimeout; + public int getTaskTimeoutVal(){ + return taskTimeout == null ? -1 : taskTimeout.intValue(); + } + @Column(name="TASK_RETRY_NUM") @ApiParam(value ="重试次数") private Integer taskRetryNum; @@ -120,6 +124,10 @@ public class LacSuitTask extends BaseBean { private LacSuitCase lacSuitCase; @Transient + @ApiParam(value ="任务实例id") + private Long taskInstanceId; + + @Transient @ApiParam(value ="适配参数") private List lacSuitTaskParamList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index f0bb101..c141c5a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.LoggerFactory; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -22,12 +25,6 @@ public class LacCommandStackModel { private Long recordId; /** - * 指令集模板 - */ - @Deprecated - private LacCommandStackTemplate commandStackTemplate; - - /** * 指令集记录 */ private LacCommandStackRecord commandStackRecord; @@ -47,13 +44,50 @@ public class LacCommandStackModel { * key : 任务编号 * value ： 原始报文 */ - private Map orginMessage = new ConcurrentHashMap<>(); + private Map orginMessageMap = new ConcurrentHashMap<>(); /** * 任务转换后报文 * key : 任务编号 * value ： 转换后报文 */ - private Map transMessage = new ConcurrentHashMap<>(); + private Map transMessageMap = new ConcurrentHashMap<>(); + + /** + * 异常信息 + */ + private Exception exception; + + public void setException(Exception exception){ + LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); + this.exception = exception; + } + + public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){ + this.commandStackRecord = commandStackRecord; + this.recordId = commandStackRecord.getId(); + } + + public List getTaskRequestParam(String taskCode){ + for (Task task : this.getRequest().getTaskList()) { + if(task.getCode().equals(taskCode)){ + return task.getParamList(); + } + } + return null; + } + + public void putOrginMessage(LacSuitTask lacSuitTask,Object orginMessage){ + if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ + return; + } + this.orginMessageMap.put(lacSuitTask.getTaskInstanceId(), orginMessage == null ? StringUtils.EMPTY : orginMessage); + } + public void putTransMessage(LacSuitTask lacSuitTask,Object transMessage){ + if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ + return; + } + this.transMessageMap.put(lacSuitTask.getTaskInstanceId(), transMessage == null ? StringUtils.EMPTY : transMessage); + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java index 9c4a0bc..46a58d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.lac; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; @@ -34,4 +35,10 @@ public class LacSuitResponse { */ private Object result; + public LacSuitResponse(){ + this.success = true; + this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription(); + } + } From 563955570daf19e4d794e6fbc97c6db6e464eea3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 31 Oct 2019 22:04:53 +0800 Subject: [PATCH 41/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201078?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 9 +++++++-- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 ----- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 11 ++++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ----- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 - 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 41e5a23..182a1d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") + @Column(name = "UNIT") @ApiParam("包装规格数量") - private String nuit; + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index f2aee4d..a302a3e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -112,10 +112,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @@ -178,7 +174,6 @@ public class MesProduceSn extends BaseBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 08e041a..3314cf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") - @ApiParam("包装规格数量") - private String nuit; + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index c89db3f..d0dfa6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -83,7 +83,7 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index fa582cd..842e8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -109,10 +109,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型") private Integer snType; @@ -171,7 +167,6 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + 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 deb4a29..a6b6ce2 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 @@ -880,7 +880,6 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean); return packBean; From 80c340308a95ea1c9d1fc8ee827df266a8643b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 31 Oct 2019 22:43:27 +0800 Subject: [PATCH 42/77] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3POJO=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 33e46a0..eee5432 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -76,12 +76,12 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 目标实体对象的名字，多个字段用半角逗号分隔 */ - @Column(name = "DEST_BEAN_NAME", length = 50) + @Column(name = "DEST_BEAN_NAME", length = 500) public String destBeanName; /** * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 */ - @Column(name = "DEST_PK_PROPERTIES", length = 50) + @Column(name = "DEST_PK_PROPERTIES", length = 500) public String destPkProperties; /** * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 From 6996dc2273e997ce3ad484a917f0ec189fda0520 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 1 Nov 2019 11:25:10 +0800 Subject: [PATCH 43/77] =?UTF-8?q?6204:=20MesConfig=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 69b01b7..98d8866 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 @@ -432,15 +432,11 @@ public class MesHqlPack { */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getCfgName())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); - } - if (mesConfig.getIsValid() != null) { - DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); - } + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean); + DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean); + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); return packBean; } @@ -1399,8 +1395,9 @@ public class MesHqlPack { } /** -<<<<<<< Updated upstream + * <<<<<<< Updated upstream * MES 缺陷查询条件封装 + * * @param mesDefect * @param organizeCode * @return @@ -1421,6 +1418,7 @@ public class MesHqlPack { /** * MES 产品类型图片查询条件封装 + * * @param mesProduceCtgyPicture * @param organizeCode * @return @@ -1440,7 +1438,9 @@ public class MesHqlPack { } - /** 设备通知对象配置 查询条件封装 + /** + * 设备通知对象配置 查询条件封装 + * * @param mesEquNotifyObjectCfg * @param organizeCode * @return @@ -1462,7 +1462,9 @@ public class MesHqlPack { return packBean; } - /** 设备作业通知配置 查询条件封装 + /** + * 设备作业通知配置 查询条件封装 + * * @param mesEquTaskNotifyCfg * @param organizeCode * @return @@ -1489,6 +1491,7 @@ public class MesHqlPack { /** * MES 类型信息查询条件封装 + * * @param mesTypeCfg * @param organizeCode * @return @@ -1512,6 +1515,7 @@ public class MesHqlPack { /** * MES 缺陷原因查询条件封装 + * * @param mesDefectCause * @param organizeCode * @return @@ -1532,6 +1536,7 @@ public class MesHqlPack { /** * 按条件分页查询mes设备点检保养维修作业 + * * @param mesEquTaskDetail * @param organizeCode * @return @@ -1555,6 +1560,7 @@ public class MesHqlPack { /** * 按条件分页查询首检件配置信息 + * * @param mesFiCfg * @param organizeCode * @return @@ -1575,6 +1581,7 @@ public class MesHqlPack { /** * 维修记录 + * * @param mesEquTaskRepairRecord * @param organizeCode * @return @@ -1589,6 +1596,7 @@ public class MesHqlPack { /** * 点检或保养记录 + * * @param mesEquTaskStandardRecord * @param organizeCode * @return From cfd7f5276ef76d01778f41118ca3ef0b2c902d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 1 Nov 2019 13:28:09 +0800 Subject: [PATCH 44/77] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 16 ++++++++++ .../pojo/model/lac/LacCommandStackModel.java | 37 +++------------------- .../java/cn/estsh/i3plus/pojo/model/lac/Task.java | 3 +- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1b2c71a..5859ae1 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -132,6 +132,22 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配原始参数") + private Object orginParam; + + @Transient + @ApiParam(value ="适配转换后参数") + private Object transParam; + + @Transient + @ApiParam(value ="原始报文") + private Object orginMessage; + + @Transient + @ApiParam(value ="转换后报文") + private Object transMessage; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index c141c5a..c9fb540 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -1,13 +1,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * @Description : lac指令集model @@ -35,23 +30,14 @@ public class LacCommandStackModel { private LacSuitRequest request; /** - * 响应数据 - */ - private LacSuitResponse response; - - /** - * 任务原始报文 - * key : 任务编号 - * value ： 原始报文 + * 请求XML */ - private Map orginMessageMap = new ConcurrentHashMap<>(); + private String requestXml; /** - * 任务转换后报文 - * key : 任务编号 - * value ： 转换后报文 + * 响应数据 */ - private Map transMessageMap = new ConcurrentHashMap<>(); + private LacSuitResponse response; /** * 异常信息 @@ -68,7 +54,7 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public List getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(String taskCode){ for (Task task : this.getRequest().getTaskList()) { if(task.getCode().equals(taskCode)){ return task.getParamList(); @@ -77,17 +63,4 @@ public class LacCommandStackModel { return null; } - public void putOrginMessage(LacSuitTask lacSuitTask,Object orginMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.orginMessageMap.put(lacSuitTask.getTaskInstanceId(), orginMessage == null ? StringUtils.EMPTY : orginMessage); - } - public void putTransMessage(LacSuitTask lacSuitTask,Object transMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.transMessageMap.put(lacSuitTask.getTaskInstanceId(), transMessage == null ? StringUtils.EMPTY : transMessage); - } - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 3ea6970..839e2e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.lac; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; -import java.util.List; /** * @Description : @@ -17,5 +16,5 @@ public class Task { private String code; - private List paramList; + private Object paramList; } From 921be6b0f211a877ade5a3c49350017f190b77f7 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 1 Nov 2019 14:13:33 +0800 Subject: [PATCH 45/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=AE=A1=E5=88=92=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 58 ++++++++++++++++------ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 32 ++++++------ .../i3plus/pojo/aps/holders/EShippingTime.java | 8 +++ .../i3plus/pojo/aps/model/ResourceCompose.java | 3 +- .../src/main/resources/relations/ShippingTime.xml | 11 ++++ 5 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 9e637b2..25967a8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -21,27 +23,55 @@ import javax.persistence.Table; @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") public class ShippingTime extends BaseAPS { + @Column(name="TIME") + @ApiParam(value ="运输时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private Integer priority; + @Column(name="PREV_RES_CODE") - @ApiParam(value ="前资源编码") - private String prevResCode; + @ApiParam(value ="前资源对象Id") + private Long prevResId; @Column(name="POST_RES_CODE") - @ApiParam(value ="后资源编码") - private String postResCode; + @ApiParam(value ="后资源对象Id") + private Long postResId; @Column(name="PREV_STAND_CODE") - @ApiParam(value ="前标准工序编码") - private String prevStandCode; + @ApiParam(value ="前标准工序对象Id") + private Long prevStandId; @Column(name="POST_STAND_CODE") - @ApiParam(value ="后标准工序编码") - private String postStandCode; + @ApiParam(value ="后标准工序对象Id") + private Long postStandId; - @Column(name="TIME") - @ApiParam(value ="运输时间") - private String time; + public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - private Integer priority; + public void setPrevRes(Resource res) { + this.prevResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevRes, res); + } + + public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } + + public void setPostRes(Resource res) { + this.postResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostRes, res); + } + + public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} + + public void setPrevStand(StandOperation stand) { + this.prevStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevStand, stand); + } + + public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } + + public void setPostStand(StandOperation stand) { + this.postStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostStand, stand); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 700a1cf..fa3db91 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -202,30 +202,26 @@ public class BeanRelation { } } - public static List lastList(BaseBean entity, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, null, args, 0); - return result; - } - - public static List lastList(BaseBean entity, Predicate filter, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, filter, args, 0); + public static List lastList(BaseBean bean, Enum... holders) { + List result = new ArrayList<>(); + lastListImpl(result, bean, bean, holders, 0); return result; } - - @SuppressWarnings("unchecked") - private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, - Enum[] args, int index) { - if (index >= args.length) { + private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, + Enum[] holders, int index) { + if (index >= holders.length) { + if (self == bean) { + return false; + } index = 0; + self = bean; } boolean bNotLast = true; - List relaEntities = list(entity, args[index]); - for (BaseBean relaEntity : relaEntities) { - if (lastListImpl(result, relaEntity, filter, args, index + 1)) { - result.add((T)relaEntity); + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + if (lastListImpl(result, nextBean, self, holders, index + 1)) { + result.add((T)nextBean); bNotLast = false; } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java new file mode 100644 index 0000000..100379b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EShippingTime { + PrevRes, // 前资源 + PostRes, // 后资源 + PrevStand, // 前标准工序 + PostStand // 后标准工序 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java index 314ecfa..b735390 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.aps.bean.WorkResource; +import java.util.ArrayList; import java.util.List; /** @@ -14,5 +15,5 @@ import java.util.List; **/ public class ResourceCompose { public WorkResource resource; - public List assResource; + public List assResource = new ArrayList<>(); } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml new file mode 100644 index 0000000..c51acb0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From 21087d5d4d9ddab44833decad99cece707f7a851 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 1 Nov 2019 15:41:26 +0800 Subject: [PATCH 46/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1092?= =?UTF-8?q?=20=E5=B7=A5=E5=BA=8FBOM=E5=92=8C=E7=89=A9=E6=96=99=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/MesProcessBomModel.java | 14 ++++++++++++++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java index 11940aa..86e92b4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -58,4 +58,18 @@ public class MesProcessBomModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; } + + public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 8736abb..42840a9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -50,11 +50,10 @@ public class MesProdBindRecordModel { } - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; - this.qty = qty; this.isValid = isValid; this.isDeleted = isDeleted; this.organizeCode = organizeCode; @@ -104,4 +103,17 @@ public class MesProdBindRecordModel { this.serialNumber = serialNumber; } + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) { + this.itemPartNo = itemPartNo; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.serialNumber = serialNumber; + } } From 2c47556abf21fa1cfe7fd93c04dc3816ec917c09 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 1 Nov 2019 16:15:23 +0800 Subject: [PATCH 47/77] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=AE=A1=E5=88=92=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 25967a8..cfffda0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; @@ -33,18 +34,22 @@ public class ShippingTime extends BaseAPS { @Column(name="PREV_RES_CODE") @ApiParam(value ="前资源对象Id") + @FieldAnnotation(property = false) private Long prevResId; @Column(name="POST_RES_CODE") @ApiParam(value ="后资源对象Id") + @FieldAnnotation(property = false) private Long postResId; @Column(name="PREV_STAND_CODE") @ApiParam(value ="前标准工序对象Id") + @FieldAnnotation(property = false) private Long prevStandId; @Column(name="POST_STAND_CODE") @ApiParam(value ="后标准工序对象Id") + @FieldAnnotation(property = false) private Long postStandId; public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index d034238..0d114d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin") + @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") private Date lockBegin; @Column(name="LOCK_END") From 9ad66157a813a9c33b27a6de4679867841c72315 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 1 Nov 2019 16:33:24 +0800 Subject: [PATCH 48/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201078-4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 9 ++++++++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java | 5 +++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index c4dfe04..8ac4a33 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -67,8 +67,12 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "子零件数量", example = "0") private Double qty; + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") + @ApiParam(value = "是否可重复") private Integer isRepeat; @Column(name = "IS_CHECK") @@ -99,6 +103,9 @@ public class MesProcessBom extends BaseBean { @ApiParam("产品条码") private String serialNumber; + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 13e4804..111be8e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :产品绑定记录表 @@ -70,11 +71,11 @@ public class MesProdBindRecord extends BaseBean { private String supplierCode; @Column(name = "LOT_NO") - @ApiParam + @ApiParam("关联批次") private String lotNo; @Column(name = "IS_FEED") - @ApiParam + @ApiParam("是否投料配置") private Integer isFeed; @Column(name = "VERSION") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index 4e0986f..58f0644 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -69,6 +69,10 @@ public class MesProcessBom extends BaseBean { @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; + + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") From 7f9f9cb242fe132bfef9c8cfe358c78882b52e18 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 1 Nov 2019 17:22:17 +0800 Subject: [PATCH 49/77] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AEpojo?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9=201092?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index f148413..db5ccea 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCtgyCode; + private String produceCategoryCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") From 154bba4b3b898bbb7ef048211283fc2b176a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 1 Nov 2019 19:59:05 +0800 Subject: [PATCH 50/77] =?UTF-8?q?LAC=20=E8=B0=83=E5=BA=A6=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 7 ++++--- .../main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index af6e6fb..c821de0 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -1,15 +1,12 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -76,6 +73,10 @@ public class LacSuitCase extends BaseBean { @ApiParam(value ="硬件类型") private Integer hardwareType; + @Column(name="SOFTWARE_SUIT_CODE") + @ApiParam(value ="软适配代码") + private String softwareSuitCode; + @Column(name="RETURN_METHOD") @ApiParam(value ="返回类型") private Integer returnMethod; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java index 75964e5..005846b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.lac; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; import java.util.List; @@ -25,4 +26,10 @@ public class LacSuitRequest { */ private List taskList; + /** + * 指令集代码 + */ + @XStreamCDATA + private String paramList; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 839e2e3..05d5dab 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.lac; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; @@ -16,5 +17,6 @@ public class Task { private String code; + @XStreamCDATA private Object paramList; } From 02e3ac4960f6b9ef3bdd6da7254500bb5e42ead3 Mon Sep 17 00:00:00 2001 From: gaochangjiang Date: Sat, 2 Nov 2019 13:35:50 +0800 Subject: [PATCH 51/77] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E3=80=91bug=20=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 49 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++ .../cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java | 19 ++++++++ .../pojo/wms/modelbean/WmsMoveInfoModel.java | 50 ++++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9546754..de64862 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2761,8 +2761,47 @@ public class WmsEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } + + public enum WMS_PART_TYPE_STR { + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"); + + private String value; + private String description; + + WMS_PART_TYPE_STR(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * 任务数据来源：检查子数据 */ @@ -2916,6 +2955,16 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c905237..5f647ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -44,6 +46,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @Column(name = "PART_TYPE_DESC") @@ -169,6 +172,7 @@ public class WmsPart extends BaseBean { @Transient @ApiParam("库存水平") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") private String stockLevelStatus; @Column(name = "IS_PROD_LOT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java new file mode 100644 index 0000000..ace266b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("库存预警入参") +public class QuanWarnDto extends Pager { + + private String organizeCode; + private Integer checked; + private String partNo; + private String partType; + + public Integer getChecked() { + return checked == null? 0 : checked; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java new file mode 100644 index 0000000..e137f64 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 移动单统计输出model + * @Reference : + * @Author : gcj + * @CreateDate : 2019-10-31 20:04 + * @Modify: + **/ +@Data +@Api("移动单统计输出model") +public class WmsMoveInfoModel { + + + @ApiParam(value = "操作时间") + private String modifyDateTime; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "交易类型") + private String transTypeCode; + @ApiParam(value = "交易类型名称") + private String transTypeName; + @ApiParam(value = "业务类型") + private String busiTypeCode; + @ApiParam(value = "处理数量") + private String sumQty; + @ApiParam(value = "工厂代码") + private String organizeCode; + @ApiParam(value = "操作状态") + private String itemStatus; + public WmsMoveInfoModel() { + } + + public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) { + this.modifyDateTime = modifyDateTime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.busiTypeCode = busiTypeCode; + this.sumQty = sumQty; + this.organizeCode = organizeCode; + } +} From 777060450e6b3b905ab475145fb34d529e9cd4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 2 Nov 2019 13:37:27 +0800 Subject: [PATCH 52/77] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5--?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index a67bfda..c98681aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -83,6 +83,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "线路代码") private String routingCode; + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目的库位") + private String destLocateNo; + public WmsRoutingRule(){} } From 457e10bc75b5846271125ae06d73aa049c8368cb Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 2 Nov 2019 14:06:01 +0800 Subject: [PATCH 53/77] =?UTF-8?q?1,=E3=80=90=E6=8B=86=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90305-4.3=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=BB=B4=E6=8A=A4=E3=80=91=E3=80=901122=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a07f3fd..457f5e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -801,8 +801,9 @@ public class WmsEnumUtil { VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), - VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"); - + VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), + VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), + VDA_SN_("VDA_SN_MERGE", "VDA条码合并"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 5f647ca..d44f335 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -175,6 +175,10 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") private String stockLevelStatus; + @Column(name="verb_num") + @ApiParam(value = "单次拆包数") + private Double verbNum; + @Column(name = "IS_PROD_LOT") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; From b963bcb502c5bba1bc7469b05a52ba2170833f5d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 11:38:26 +0800 Subject: [PATCH 54/77] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 10 ++- .../pojo/lac/bean/LacCommandStackRecord.java | 6 +- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 8 +++ .../pojo/lac/bean/LacCommandStackStepTask.java | 16 +++++ .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 27 ++++++-- .../i3plus/pojo/lac/bean/LacLogTaskDetail.java | 16 +++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 10 +-- .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 71 ++++++++++++++++++++++ 8 files changed, 152 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index 85262b4..e5ad0f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -141,9 +141,13 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STACK_STATUS{ - RUNNING(1,"运行中"), - PAUSE(2,"暂停"), - FINISH(3,"完成"); + INIT(10,"初始化"), + WAIT(20,"等待中"), + RUNNING(30,"运行中"), + PAUSE(40,"手动暂停"), + FINISH(100,"执行完成"), + RUN_ERROR(101,"运行异常"), + RUN_STOP(102,"手动结束"); private int value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index eea1bf4..e108f1b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean { @Column(name="STACK_SPEND") @ApiParam(value ="执行耗时") - private Integer stackSpend; + private Long stackSpend; @Column(name="STACK_STATUS") @ApiParam(value ="执行状态") @@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean { private String executionDescription; @Transient + @ApiParam(value ="指令集模板") + private LacCommandStackTemplate template; + + @Transient @ApiParam(value ="步骤列表") private List stepList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index cbe2d05..41be18c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean { @Transient @ApiParam(value ="步骤任务列表") private List stepTaskList; + + + public LacCommandStackStep() { + } + + public LacCommandStackStep(Long templateId) { + this.templateId = templateId; + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index b1d8a30..1b43256 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + /** + * 不建议使用 + */ + @Deprecated @Column(name="TASK_INSTANCE_ID") @ApiParam(value ="任务实例ID") @JsonSerialize(using = ToStringSerializer.class) @@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean { @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; + @Transient @ApiParam(value ="适配任务") private LacSuitTask lacSuitTask; + + @Transient + @ApiParam(value ="适配任务记录") + private LacLogTask logTask; + + public LacCommandStackStepTask() { + } + + public LacCommandStackStepTask(Long templateId) { + this.templateId = templateId; + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index daab86e..6f74bbf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -32,6 +32,12 @@ import javax.persistence.Table; public class LacLogTask extends BaseBean { private static final long serialVersionUID = 674009105885048131L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -50,6 +56,10 @@ public class LacLogTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long commandStackTypeId; + @Column(name="COMMAND_STACK_TYPE_NAME_RDD") + @ApiParam(value ="指令集类型名称") + private String commandStackTypeNameRdd; + @Column(name="STEP_ID") @ApiParam(value ="步骤ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -61,7 +71,7 @@ public class LacLogTask extends BaseBean { @Column(name="STEP_SEQUENCE") @ApiParam(value ="步骤顺序") - private String stepSequence; + private Integer stepSequence; @Column(name="TASK_ID") @ApiParam(value ="任务ID" , example = "-1") @@ -72,16 +82,25 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务名称") private String taskNameRdd; - @Column(name="TASK_NAME_TYPE") + @Column(name="TASK_TYPE_ID") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型") + private String taskTypeNameRdd; @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long adapterId; + @Column(name="TASK_DETAIL_ID") + @ApiParam(value ="任务执行记录明细" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskDetailId; + @Lob @Column(name="INPUT_PARAMETER") @ApiParam(value ="任务入参") @@ -97,7 +116,7 @@ public class LacLogTask extends BaseBean { @Column(name="TASK_SPEND") @ApiParam(value ="任务耗时") - private Integer taskSpend; + private Long taskSpend; @Column(name="TASK_STATUS") @ApiParam(value ="任务状态") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 3a3f05e..7fa12bd 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean { private static final long serialVersionUID = -4918694502072594064L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -53,6 +59,11 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskId; + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + @Column(name="TASK_NAME_TYPE") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) @@ -91,4 +102,9 @@ public class LacLogTaskDetail extends BaseBean { @ApiParam(value ="任务出参处理后") private String outputParameterBody; + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务执行异常信息") + private String errorMessage; + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 5859ae1..22c04a7 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="任务描述") private String taskDescription; + /********************************** 虚拟字段 **********************************/ + @Transient @ApiParam(value ="适配套件") private LacSuitCase lacSuitCase; @@ -128,10 +130,6 @@ public class LacSuitTask extends BaseBean { private Long taskInstanceId; @Transient - @ApiParam(value ="适配参数") - private List lacSuitTaskParamList; - - @Transient @ApiParam(value ="适配原始参数") private Object orginParam; @@ -148,6 +146,10 @@ public class LacSuitTask extends BaseBean { private Object transMessage; @Transient + @ApiParam(value ="适配参数") + private List lacSuitTaskParamList; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index d147827..6d04b02 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.lac.bean.*; +import java.util.List; + /** * @Description : * @Reference : @@ -32,6 +34,75 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + return ddlPackBean; } From f111febd8d695df78de9fa004f5c3b24a0409225 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 4 Nov 2019 11:43:19 +0800 Subject: [PATCH 55/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E2=80=9D=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=BA=E2=80=9C=E8=87=AA=E5=A4=84=E7=90=86?= =?UTF-8?q?=E2=80=9D=EF=BC=8C=20=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b27a4a3..7699fbe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -667,7 +667,7 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM", 111020006, "质量"), EQUIP("EQUMENT_ALARM", 111020007, "设备"), PROCESS("ROUTING_ALARM", 111020008, "工艺"), - CHECK("OTHER_ALARM", 111020009, "其他"), + CHECK("OTHER_ALARM", 111020009, "自处理"), FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; From 0d777d1894c6ff46aa92140e96be81c1b2635d1b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 12:21:13 +0800 Subject: [PATCH 56/77] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 6f74bbf..aa6ca4a 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -122,4 +122,9 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务状态") private Integer taskStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 7fa12bd..01cc4d0 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -82,6 +82,10 @@ public class LacLogTaskDetail extends BaseBean { @ApiParam(value ="任务结束时间") private String taskEndTime; + @Column(name="TASK_SPEND") + @ApiParam(value ="任务耗时") + private Long taskSpend; + @Lob @Column(name="INPUT_PARAMETER") @ApiParam(value ="任务入参") From 1de5b8b196dbe395bdb6f07c055ab7b5a19bc98c Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 14:02:38 +0800 Subject: [PATCH 57/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index c7a0b65..2e36dff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1900,4 +1900,37 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ONLINE_SEND_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"); + + private int value; + private String description; + + ONLINE_SEND_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From 0ba20f0094a1a96a292c2e51e3771e9c2f4a6d61 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 14:33:22 +0800 Subject: [PATCH 58/77] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index aa6ca4a..4ebc6e9 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.List; /** * @Description : @@ -126,5 +124,7 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; - + @Transient + @ApiParam(value ="步骤列表") + private List detailList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 01cc4d0..8c5a66c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -54,6 +54,11 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + @Column(name="LOG_TASK_ID") + @ApiParam(value ="任务实例ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long logTaskId; + @Column(name="TASK_ID") @ApiParam(value ="任务ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 6d04b02..9a42293 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -34,8 +34,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); return ddlPackBean; } From 855cc4644827717f62fbe4b28d4ab9645cf1a4fc Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 14:35:15 +0800 Subject: [PATCH 59/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 2e36dff..e85047d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1903,18 +1903,18 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC("PLC", "PLC"), + DB("DB", "DB"); - private int value; + private String value; private String description; - ONLINE_SEND_TYPE(int value, String description) { + ONLINE_SEND_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -1922,7 +1922,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { From 3ef115bbe26c538e1bdea11771ae5c55cd61eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 4 Nov 2019 15:14:49 +0800 Subject: [PATCH 60/77] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c4c545d..a3e8927 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -270,6 +270,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("筛选（>=）或<") private String choose; + @Transient + @ApiParam("批次校验规则") + private String lotCheckRule; + public WmsStockSn() { } From 4308084ca304f90a8afe5238f2f5e4423e92b2ac Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 15:54:45 +0800 Subject: [PATCH 61/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index ac36ee1..633a068 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -33,9 +33,13 @@ public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 88c9257..9f2dc8c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -30,9 +30,13 @@ import javax.persistence.Transient; public class MesProduceSn extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; From 32dbaed8fea47349be5fb2c4af84f751f56275d9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 4 Nov 2019 18:07:39 +0800 Subject: [PATCH 62/77] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1129?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E8=B1=A1=E3=80=81=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E3=80=81=E4=BA=A7=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 76 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 1 - .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 6 +- .../mes/repository/MesDataObjectRepository.java | 14 ++++ .../mes/repository/MesObjectCfgRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 72 ++++++++++++++++++++ 6 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index fc5e745..2a6c96c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -9,9 +9,85 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @CreateDate : 2018-10-23 15:53 * @Modify: **/ + public class MesEnumUtil { /** + * MesDatasource 数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DB_SOURCE_TYPE { + + SOURCE_MARIA_DB("SOURCE_MARIA_DB", "MariaDB"), + SOURCE_SQL_SERVER("SOURCE_SQL_SERVER", "SQL Server"), + SOURCE_ORACLE("SOURCE_ORACLE", "Oracle"), + SOURCE_POSTGRE_SQL("SOURCE_POSTGRE_SQL", "PostgreSql"); + + private String value; + private String description; + + MES_DB_SOURCE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesRepair 数据对象操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DADA_OPRATE_TYPE { + + INSERT(10, "insert"), + SELECT(20, "select"), + UPDATE(30, "update"); + + private int value; + private String description; + + MES_DADA_OPRATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesRepair 处理措施 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index debf5a3..c41888b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 72fbe02..50b9ecf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -47,6 +47,10 @@ public class MesProdPack extends BaseBean { @ApiParam("包装标签模板2") private String packLabelTemplate2; + @Column(name = "PACK_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packLabelTemplate; + @Column(name = "PACK_LABEL_TEMPLATE3") @ApiParam("包装标签模板3") private String packLabelTemplate3; @@ -58,6 +62,4 @@ public class MesProdPack extends BaseBean { @Column(name = "PROD_CFG_TYPE") @ApiParam("项目") private String prodCfgType; - - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java new file mode 100644 index 0000000..b17e7ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataObject; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\4 9:53 + * @Modify: + **/ +public interface MesDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java new file mode 100644 index 0000000..f310400 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesObjectCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\4 9:37 + * @Modify: + **/ +public interface MesObjectCfgRepository extends BaseRepository { +} 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 69b01b7..ad7909d 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 @@ -1603,4 +1603,76 @@ public class MesHqlPack { } return packBean; } + + /** + * 对象结构 + * @param mesObjectCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesObjectCfg(MesObjectCfg mesObjectCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesObjectCfg, organizeCode); + if (!StringUtils.isEmpty(mesObjectCfg.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldCode())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldCode(), "fieldCode", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldName())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldName(), "fieldName", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldType())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldType(), "fieldType", packBean); + } + return packBean; + } + + /** + * 数据对象 + * @param mesDataObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode); + if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean); + } + if (mesDataObject.getOperateType() != null) { + DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean); + } + return packBean; + } + + /** + * 产品包装关系 + * @param mesProdPack + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProdPack(MesProdPack mesProdPack, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdPack, organizeCode); + if (!StringUtils.isEmpty(mesProdPack.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) { + DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getPackLabelTemplate())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getPackLabelTemplate(), "packLabelTemplate", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getProdLabelTemplate())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getProdLabelTemplate(), "prodLabelTemplate", packBean); + } + return packBean; + } } From da7ba77dabb7d504aa5487e16fdba15c6e66391a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 19:51:07 +0800 Subject: [PATCH 63/77] =?UTF-8?q?LAC=20=E8=B7=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=BD=AF=E9=80=82=E9=85=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/lac/bean/LacLogTaskDetail.java | 2 +- .../i3plus/pojo/model/common/CloudPagerModel.java | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 8c5a66c..d2b3cd2 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -112,7 +112,7 @@ public class LacLogTaskDetail extends BaseBean { private String outputParameterBody; @Lob - @Column(name="OUTPUT_PARAMETER_BODY") + @Column(name="ERROR_MESSAGE") @ApiParam(value ="任务执行异常信息") private String errorMessage; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java new file mode 100644 index 0000000..29a4dbf --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.common; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-11-4 下午7:37 + * @Modify: + **/ +@Data +public class CloudPagerModel { + + @ApiParam("查询对象") + private T obj; + + @ApiParam("分页参数") + private Pager pager; +} From 7aa078e7ce7ee329650e2cdf157b8b2537a0e216 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 4 Nov 2019 20:10:29 +0800 Subject: [PATCH 64/77] =?UTF-8?q?1:=E4=BF=AE=E5=A4=8D=E6=9C=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9F=BA=E5=87=86=E6=97=B6=E9=97=B4=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 0d114d5..f3e64de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") + @RippleAnnotation(dependence = {"Work.PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") private Date lockBegin; @Column(name="LOCK_END") From 809e23aad7bd25ae53eede40cc2ca4361dbdba6d Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 5 Nov 2019 09:43:00 +0800 Subject: [PATCH 65/77] =?UTF-8?q?1:=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E7=9A=84Bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 4c43a95..e206810 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -229,6 +229,15 @@ public class BeanInfo { return null; } + public static List> getChildClasses(Class cls) { + List> beanClasses = new ArrayList<>(); + List beanInfos = getBeanInfo(cls).childsBeanInfos; + for (BeanInfo beanInfo : beanInfos) { + beanClasses.add(beanInfo.getBeanClass()); + } + return beanClasses; + } + public static FIELD_TYPE getFieldType(Class cls) { FIELD_TYPE type = null; if (cls == Boolean.class || cls == boolean.class) { From 1a7fda268bd73e6cd0976991663f9b5d476df8ac Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 5 Nov 2019 10:51:11 +0800 Subject: [PATCH 66/77] =?UTF-8?q?andon=20=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 547a389..9362815 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -439,11 +439,10 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result); - + DdlPreparedPack.getNumEqualPack(andonConfig.getConfigGroup(), "configGroup", result); + DdlPreparedPack.getNumEqualPack(andonConfig.getConfigType(), "configType", result); getStringBuilderPack(andonConfig, result); - return result; } From b7071bd0db2ff6da1bbd21cc88094b1d7c3cf747 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 5 Nov 2019 12:26:11 +0800 Subject: [PATCH 67/77] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 72b1248..0c9c9bf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -93,6 +93,10 @@ public class WmsPoSn extends BaseBean { @ApiParam("默认收货库存地") private String erpAreaNoAdd; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index 0796d27..bbc0e78 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -81,4 +81,8 @@ public class WmsQCTrans extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") public String qcTime; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; } From 64cda23c122611ce21a296938d604b80a71ac7f7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 5 Nov 2019 14:06:24 +0800 Subject: [PATCH 68/77] =?UTF-8?q?1:=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttCalendarModel.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java 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 new file mode 100644 index 0000000..f25c1f7 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class GanttCalendarModel { + @Data + public static class Block { + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date beginTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + private Boolean onDuty; + } + private Long resourceId; + private List timeBlocks = new ArrayList<>(); +} From 9418a0838be0bb457ea8f48cc295c589dbaf1429 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 5 Nov 2019 17:01:08 +0800 Subject: [PATCH 69/77] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1129?= =?UTF-8?q?=20=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 82 +++++++++++++++++++++- .../i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 46 ++++++++++++ .../repository/MesProductEncodeCfgRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 25 ++++++- 4 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 2a6c96c..55323d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,6 +13,82 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesProductEncodeCfg 匹配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_MATCH_TYPE { + + ORGANIZATION("10", "工厂"), + PART("20", "物料"), + CUST_CODE("30", "客户代码"), + CUST_PART_NO("40", "客户物料号"), + WORK_CENTER("50", "产线"); + + private String value; + private String description; + + MES_MATCH_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesProductEncodeCfg 编码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_CODE_TYPE { + + SERIAL_SN("10", "过程条码"), + PRODUCT_SN("20", "产品条码"), + PACK_SN("30", "包装条码"); + + private String value; + private String description; + + MES_CODE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesDatasource 数据源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -51,10 +127,10 @@ public class MesEnumUtil { } /** - * MesRepair 数据对象操作类型 + * Mes 数据对象操作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_DADA_OPRATE_TYPE { + public enum MES_DATA_OPERATE_TYPE { INSERT(10, "insert"), SELECT(20, "select"), @@ -63,7 +139,7 @@ public class MesEnumUtil { private int value; private String description; - MES_DADA_OPRATE_TYPE(int value, String description) { + MES_DATA_OPERATE_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java new file mode 100644 index 0000000..5eac148 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\5 10:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_ENCODE_CFG") +@Api("产品编码配置") +public class MesProductEncodeCfg extends BaseBean { + + @Column(name = "CODE_TYPE") + @ApiParam("编码类型") + private String codeType; + + @Column(name = "MATCH_TYPE") + @ApiParam("匹配类型") + private String matchType; + + @Column(name = "MATCH_VALUE") + @ApiParam("匹配值") + private String matchValue; + + @Column(name = "RULE_CODE") + @ApiParam("编码规则代码") + private String ruleCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java new file mode 100644 index 0000000..e32004c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProductEncodeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\5 10:59 + * @Modify: + **/ +public interface MesProductEncodeCfgRepository extends BaseRepository { +} 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 f3d65be..a524002 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 @@ -1653,7 +1653,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean); } if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { - DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean); + DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean); } return packBean; } @@ -1683,4 +1683,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 产品编码配置 + * @param mesProductEncodeCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProductEncodeCfg(MesProductEncodeCfg mesProductEncodeCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProductEncodeCfg, organizeCode); + if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchValue())) { + DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", packBean); + } + return packBean; + } } From 3b447fa77a7d04501f201ceb2e3ae0fba75931ff Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 5 Nov 2019 18:08:34 +0800 Subject: [PATCH 70/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index e85047d..b7a1607 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1933,4 +1933,40 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_TRAVEL_OPERATE { + + WORKCELL_SCAN(10, "工位扫描"), + CHECK_QUALITY(20, "质量判定"), + DISASSEMBLE_MATERIAL(30, "物料拆解"), + REWORK(40, "返修作业"); + + private int value; + private String description; + + SN_TRAVEL_OPERATE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + } From be75c4ec42dc8e3cb20d13e24edc14881530dc6e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 5 Nov 2019 19:04:00 +0800 Subject: [PATCH 71/77] =?UTF-8?q?=E3=80=90VDA=E8=B4=A8=E6=A3=80--=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E3=80=91=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=B71135=20=E3=80=90VDA=E8=B4=A8=E6=A3=80--?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F=E7=BB=84=E4=BB=B6--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=E4=BB=BB=E5=8A=A1=E5=8F=B71134=20?= =?UTF-8?q?=E3=80=90VDA=E8=B4=A8=E6=A3=80--=E6=A3=80=E6=9F=A5=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E7=AE=B1=E6=95=B0=E7=BB=84=E4=BB=B6=E3=80=91=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=B71133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 457f5e5..f19d4a0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -624,7 +624,8 @@ public class WmsEnumUtil { VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"), VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), - VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"); + VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_QC(290, "VDA_QC", "VDA质检"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index d44f335..d566fe1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -166,6 +166,10 @@ public class WmsPart extends BaseBean { @ApiParam("报工产线") private String productLines; + @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") + @ApiParam(value = "待质检比例", example = "1") + private Double proportion; + @Transient @ApiParam("总数量") private Double qty; From c68cb7889e602b7dedc557265db80902f528f8c8 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 5 Nov 2019 20:07:57 +0800 Subject: [PATCH 72/77] =?UTF-8?q?=E3=80=90VDA=E7=89=A9=E6=96=99=E6=8B=86?= =?UTF-8?q?=E5=88=86-=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F-=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E9=AA=8C=E3=80=91=E3=80=906233=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index f19d4a0..ed412ca 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -625,7 +625,9 @@ public class WmsEnumUtil { VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"), VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), - VDA_QC(290, "VDA_QC", "VDA质检"); + VDA_QC(290, "VDA_QC", "VDA质检"), + VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); private int value; From b2886012a56c69f7f2161f2f145d5c7fef81ece5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 6 Nov 2019 16:37:13 +0800 Subject: [PATCH 73/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82id=EF=BC=9A116?= =?UTF-8?q?2=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 55323d9..20acec9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2595,7 +2595,8 @@ public class MesEnumUtil { PCN_PULL(60, "PCN_PULL"), PCN_PUSH(70, "PCN_PUSH"), FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), - REWORK_REPAIR(90, "REWORK_REPAIR"); + REWORK_REPAIR(90, "REWORK_REPAIR"), + PCN_LOGIN(100, "PCN_LOGIN"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index e0cd19d..b239fb2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -58,4 +58,8 @@ public class MesPcnSysUserOffline extends BaseBean { @ApiParam(value = "部门名称", access = "部门名称") private String organizeName; + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + } From 9a6c5cfda31b67786a8b1323e475bad5cd1e8e60 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 6 Nov 2019 17:51:33 +0800 Subject: [PATCH 74/77] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1163?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 118 ++++++++++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 83 +++++++++++++++ .../mes/repository/MesCustOrderRepository.java | 14 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 33 ++++++ 4 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 55323d9..6c52559 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,121 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + + /** + * Mes 客户订单来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CUST_ORDER_SOURCE { + + MES("MES", "来源于MES"), + SAP("SAP", "来源于SAP"); + + private String value; + private String description; + + CUST_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesCustOrder 订单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CUST_ORDER_TYPE { + + STANDARD(10, "标准"); + + private int value; + private String description; + + CUST_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesCustOrder实体对应的status值 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CUST_ORDER_STATUS { + + CREATE(10, "CREATED", "创建"), + DEAL(20, "DEAL", "已处理"), + CLOSE(30, "CLOSE", "关闭"); + + private int value; + private String code; + private String description; + + CUST_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * MesProductEncodeCfg 匹配类型 */ @@ -737,7 +852,8 @@ public class MesEnumUtil { MES_PLAN_ORDER(10, "生产计划"), MES_EQUIPMENT(20, "设备台账"), - MES_EQU_TASK_STANDARD(30, "设备作业要求"); + MES_EQU_TASK_STANDARD(30, "设备作业要求"), + MES_CUST_ORDER(40, "客户订单"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java new file mode 100644 index 0000000..3758b18 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\6 11:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUST_ORDER") +@Api("客户信息") +public class MesCustOrder extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + private String orderNo; + + @Column(name = "ORDER_TYPE") + @ApiParam("订单类型") + private Integer orderType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "ORDER_DATE") + @ApiParam("订单日期") + private String orderDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam(value = "订单日期查询用，查询开始日期", example = "2019-01-31 23:59:59") + public String orderTimeStart; + + @Transient + @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59") + public String orderTimeEnd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.java new file mode 100644 index 0000000..fb4baa8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\6 13:47 + * @Modify: + **/ +public interface MesCustOrderRepository extends BaseRepository { +} 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 a524002..514f70f 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 @@ -1706,4 +1706,37 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户订单 + * @param mesCustOrder + * @param organizeCode + * @return + */ + public static DdlPackBean getMesCustOrder(MesCustOrder mesCustOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustOrder, organizeCode); + if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) { + DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) { + DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean); + } + if (mesCustOrder.getOrderType() != null) { + DdlPreparedPack.getNumEqualPack(mesCustOrder.getOrderType(), "orderType", packBean); + } + if (mesCustOrder.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean); + } + DdlPreparedPack.timeBuilder( + mesCustOrder.getOrderTimeStart(), + mesCustOrder.getOrderTimeEnd(), + "orderDate", packBean, true); + return packBean; + } } From 980ae89cdfe0eb4cd6191b80c29b3b0c40094d00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 6 Nov 2019 19:55:13 +0800 Subject: [PATCH 75/77] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82id=EF=BC=9A116?= =?UTF-8?q?2=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index b239fb2..f1e5193 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -62,4 +59,9 @@ public class MesPcnSysUserOffline extends BaseBean { @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") private Integer userType; + @Lob + @Column(name="MENU_LIST") + @ApiParam(value ="菜单" , access ="菜单") + private String menuList; + } From fc79b1b0f3d8401fc664020e36e3151cb1503884 Mon Sep 17 00:00:00 2001 From: lpx Date: Thu, 7 Nov 2019 10:09:57 +0800 Subject: [PATCH 76/77] =?UTF-8?q?=E3=80=90=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91=E3=80=90308=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-4.2=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=90?= =?UTF-8?q?1132=E6=89=AB=E6=8F=8F=E6=9F=A5=E8=AF=A2-4.2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ed412ca..b57b7bc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -806,7 +806,10 @@ public class WmsEnumUtil { VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), - VDA_SN_("VDA_SN_MERGE", "VDA条码合并"); + VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), + VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), + VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"); + private String value; private String description; From fc49ddeea586a7430b057e688dabfeca347d1342 Mon Sep 17 00:00:00 2001 From: lpx Date: Thu, 7 Nov 2019 15:00:56 +0800 Subject: [PATCH 77/77] =?UTF-8?q?=E3=80=90=E4=BA=8B=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91=E3=80=90326EU=E4=BA=8B=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E5=8A=A1=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=901157=C2=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index de05dbf..d5a5fe5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -224,7 +224,6 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -233,6 +232,16 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } + public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) { + this.partNo = partNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.busiTypeCode = busiTypeCode; + this.qty = qty; + } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,