From b47f97fa054e1d24c3cee72164ee477237d88828 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 23 Oct 2019 22:39:19 +0800 Subject: [PATCH 01/14] =?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/14] =?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/14] =?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 6de6d36e809009dceb63380e4b8db75dc9f33463 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 28 Oct 2019 21:22:36 +0800 Subject: [PATCH 04/14] =?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 95789b1bd89ca201e76857f5692c63483a65a2a8 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 29 Oct 2019 18:36:34 +0800 Subject: [PATCH 05/14] =?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 dcaf007f4db4eea0cdd2508749f103da2e68fdee Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 09:44:11 +0800 Subject: [PATCH 06/14] =?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 07/14] =?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 08/14] =?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 09/14] =?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 10/14] =?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 11/14] =?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 12/14] =?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 13/14] =?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 14/14] =?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; + }