From b3aa6eef70d59b43b71b8556a36b627c44073ec3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 24 Aug 2020 23:29:24 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E4=B8=AD=E8=88=AA=20=E5=9D=87=E5=80=BC?= =?UTF-8?q?=E6=9E=81=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 +++++++++++ .../pojo/mes/bean/MesSpcControlCoefficient.java | 52 ++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java | 70 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/BarModel.java | 26 ++++++++ .../i3plus/pojo/mes/model/ProductBiModel.java | 6 ++ .../MesSpcControlCoefficientRepository.java | 17 ++++++ .../mes/repository/MesSpcKeyDataRepository.java | 17 ++++++ 7 files changed, 223 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.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 ba0b0c0..a6d9746 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 @@ -6930,4 +6930,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXTRACT_OBJECT_TYPE { + MODEL(10, "实体对象（单表）"), + PRODUCT_DATA(20, "动态对象（生产数据表）"); + + private Integer value; + private String description; + + EXTRACT_OBJECT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java new file mode 100644 index 0000000..4c896fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -0,0 +1,52 @@ +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPC_CONTROL_COEFFICIENT") +@Api("MES_SPC控制图系数") +public class MesSpcControlCoefficient extends BaseBean implements Serializable { + private static final long serialVersionUID = -2790965693171941915L; + + @Column(name = "SINGLE_GROUP_QTY") + @ApiParam("子组容量") + private Integer singleGroupQty; + + @Column(name = "COEFFICIENT_TYPE") + @ApiParam("系数类型") + private String coefficientType; + + @Column(name = "COEFFICIENT_CODE") + @ApiParam("系数代码") + private String coefficientCode; + + @Column(name = "COEFFICIENT_DESC") + @ApiParam("系数描述") + private String coefficientDesc; + + @Column(name = "COEFFICIENT_VALUE") + @ApiParam("系数值") + private Double coefficientValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java new file mode 100644 index 0000000..774a869 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -0,0 +1,70 @@ +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPC_KEY_DATA") +@Api("MES_SPC关键数据") +public class MesSpcKeyData extends BaseBean implements Serializable { + private static final long serialVersionUID = 2255345691671062029L; + + @Column(name = "KD_CODE") + @ApiParam("关键数据代码") + private String kdCode; + + @Column(name = "KD_NAME") + @ApiParam("关键数据名称") + private String kdName; + + @Column(name = "NOMINAL_VALUE") + @ApiParam("公称值") + private Double nominalValue; + + @Column(name = "SPEC_USL") + @ApiParam("规格上限") + private Double specUsl; + + @Column(name = "SPEC_LSL") + @ApiParam("规格下限") + private Double specLsl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("取值对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("取值对象") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("取值字段") + private String fieldCode; + + @Column(name = "KD_CONDITION") + @ApiParam("取值条件") + private String kdCondition; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java new file mode 100644 index 0000000..327f14d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/8/24 16:50 + * @desc + */ +@Data +public class BarModel { + + private String workCenterCode; + + private String keyData; + + private String partNo; + + private Integer count; + + private Integer groupCount; + + private String startTime; + + private String endTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index c2e0eb3..f74fd51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -87,6 +87,12 @@ public class ProductBiModel { @ApiParam("列名") private Map colMap; + @ApiParam("工位顺序") + private Integer workCellSeq; + + @ApiParam("是否开启工单标识") + private Integer opWoFlag; + @Deprecated public double getCompleteRate() { if (this.planQty != 0) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java new file mode 100644 index 0000000..a29a30d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.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.MesSpcControlCoefficient; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcControlCoefficientRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java new file mode 100644 index 0000000..8b8a4e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.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.MesSpcKeyData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcKeyDataRepository extends BaseRepository { + +} From ebd12f7c65ac2931de126477bbf0e7a0c9a0663c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 25 Aug 2020 13:50:18 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E5=8E=BB=E9=99=A4ProductBiModel=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index 8cba294..5f3da6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -93,12 +93,6 @@ public class ProductBiModel { @ApiParam("列名") private Map colMap; - @ApiParam("工位顺序") - private Integer workCellSeq; - - @ApiParam("是否开启工单标识") - private Integer opWoFlag; - @Deprecated public double getCompleteRate() { if (this.planQty != 0) { From 9563ebeb664944ab0bfc4444d2326e1294e501d4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 27 Aug 2020 18:49:00 +0800 Subject: [PATCH 03/23] normalDistribution --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 56 +++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/mes/model/BarModel.java | 26 ---- .../i3plus/pojo/mes/model/BarRequestModel.java | 134 +++++++++++++++++++++ .../pojo/mes/model/NormalDistributionModel.java | 95 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/RbarModel.java | 32 +++++ .../cn/estsh/i3plus/pojo/mes/model/XbarModel.java | 33 +++++ 7 files changed, 342 insertions(+), 37 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.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 3a1eefc..c159a3e 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 @@ -3187,8 +3187,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"), - LABEL_PROPERTIES(40,"标签属性查询方法"); + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; @@ -5823,9 +5823,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_DATA_TYPE { STRING("10", "String", "字符串"), - BOOLEAN("20","Boolean", "布尔"), + BOOLEAN("20", "Boolean", "布尔"), WORD("30", "Word", "整形-Word"), - DWORD("40","Dword", "整形-DWord"), + DWORD("40", "Dword", "整形-DWord"), LONG("50", "Long", "长整形-Long"), SHORT("60", "Short", "UShort"), DOUBLE("70", "Double", "双精度-Double"), @@ -5842,7 +5842,7 @@ public class MesEnumUtil { private String code; private String description; - PLC_DATA_TYPE(String value, String code,String description) { + PLC_DATA_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5865,6 +5865,7 @@ public class MesEnumUtil { } return tmp; } + public static String codeOfValue(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6697,10 +6698,10 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DATA_OBJECT { - BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"), - CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList", "MesCustomerPart","客户物料号"), - CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList", "MesCustomer","客户信息"), - PART("soapenv#Envelope#SyncItem","getPartList", "MesPart","物料信息"); + BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom", "BOM"), + CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem", "getCustomerPartList", "MesCustomerPart", "客户物料号"), + CUSTOMER("soapenv#Envelope#SyncCustomer", "getCustomerList", "MesCustomer", "客户信息"), + PART("soapenv#Envelope#SyncItem", "getPartList", "MesPart", "物料信息"); private String code; private String method; @@ -6983,7 +6984,7 @@ public class MesEnumUtil { } /** - * + * 取值对象类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EXTRACT_OBJECT_TYPE { @@ -7016,4 +7017,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * 系数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COEFFICIENT_TYPE { + CONTROL(10, "控制限系数"), + CENTER(20, "中心线系数"); + + private Integer value; + private String description; + + COEFFICIENT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 d464a7f..2c025ef 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 @@ -3554,7 +3554,8 @@ public class MesPcnEnumUtil { JUMP_STEP(10, "JUMP_STEP", "跳过工步"), REDO_PROCESS(20, "REDO_PROCESS", "重做工序"), JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"), - NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"); + NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"), + CLEAR_CACHE(50, "CLEAR_CACHE", "工步已经清空缓存 无需执行完之后放入RequestBean"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java deleted file mode 100644 index 327f14d..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import lombok.Data; - -/** - * @author Wynne.Lu - * @date 2020/8/24 16:50 - * @desc - */ -@Data -public class BarModel { - - private String workCenterCode; - - private String keyData; - - private String partNo; - - private Integer count; - - private Integer groupCount; - - private String startTime; - - private String endTime; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java new file mode 100644 index 0000000..9721df9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java @@ -0,0 +1,134 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/24 16:50 + * @desc + */ +public class BarRequestModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("关键数据代码") + private String keyData; + + @ApiParam("零件号") + private List partNos; + + @ApiParam("单组数量") + private Integer count; + + @ApiParam("组数") + private Integer groupCount; + + @ApiParam("总数") + private Integer totalCount; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("均值图") + private boolean xbar; + + @ApiParam("极差图") + private boolean rbar; + + @ApiParam("正太分布图") + private boolean normalDistribution; + + public String getWorkCenterCode() { + return workCenterCode; + } + + public void setWorkCenterCode(String workCenterCode) { + this.workCenterCode = workCenterCode; + } + + public String getKeyData() { + return keyData; + } + + public void setKeyData(String keyData) { + this.keyData = keyData; + } + + public List getPartNos() { + return partNos; + } + + public void setPartNos(List partNos) { + this.partNos = partNos; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getGroupCount() { + return groupCount; + } + + public void setGroupCount(Integer groupCount) { + this.groupCount = groupCount; + } + + public Integer getTotalCount() { + return this.count * this.groupCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public boolean isXbar() { + return xbar; + } + + public void setXbar(boolean xbar) { + this.xbar = xbar; + } + + public boolean isRbar() { + return rbar; + } + + public void setRbar(boolean rbar) { + this.rbar = rbar; + } + + public boolean isNormalDistribution() { + return normalDistribution; + } + + public void setNormalDistribution(boolean normalDistribution) { + this.normalDistribution = normalDistribution; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java new file mode 100644 index 0000000..52beedd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/26 14:46 + * @desc + */ +@Data +public class NormalDistributionModel { + + @ApiParam("尺寸上限") + private Double usl; + + @ApiParam("尺寸下限") + private Double lsl; + + @ApiParam("柱状图") + private List bar = new ArrayList<>(); + + @ApiParam("曲线图") + private List line = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private List xAxis = new ArrayList<>(); + + @ApiParam("数据个数") + private Integer totalCount; + + @ApiParam("平均均值") + private Double xbarbar; + + @ApiParam("平均极差") + private Double rbar; + + @ApiParam("最大值") + private Double maxValue; + + @ApiParam("最小值") + private Double minValue; + + @ApiParam("低于下限数据个数") + private Integer belowLowerLimitCount; + + @ApiParam("高于上限数据个数") + private Integer aboveUpperLimitCount; + + @ApiParam("d2") + private Double d2; + + @ApiParam("n") + private Integer n; + + @ApiParam("高能力指数") + private Double cpu; + + @ApiParam("低能力指数") + private Double cpl; + + @ApiParam("过程能力指数") + private Double cp; + + @ApiParam("过程能力") + private Double cpk; + + @ApiParam("过程比率") + private Double cr; + + @ApiParam("标准偏差n") + private Double stdOffset; + + @ApiParam("标准偏差n-1") + private Double stdOffsetMinusOne; + + @ApiParam("方差n") + private Double variance; + + @ApiParam("方差n-1") + private Double varianceMinusOne; + + @ApiParam("性能指数") + private Double pp; + + @ApiParam("性能比率") + private Double pr; + + @ApiParam("性能指数") + private Double ppk; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java new file mode 100644 index 0000000..17ed649 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:23 + * @desc + */ +@Data +public class RbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("极差-蓝线 key组号，value值") + private List maxGap = new ArrayList<>(); + + @ApiParam("平均极差-绿线") + private Double rbar; + + @ApiParam("标准差") + private Double stdDev; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java new file mode 100644 index 0000000..b4b47a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:22 + * @desc + */ +@Data +public class XbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("均值-蓝线 key组号，value值") + private List xbar = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private Double xbarbar; + + @ApiParam("标准差") + private Double stdDev; + + +} From a580c70c0433905a5519f2dec44105c7801ee250 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 27 Aug 2020 23:34:45 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A3=E6=80=81?= =?UTF-8?q?=E5=88=86=E5=B8=83=E6=95=B0=E6=8D=AE=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java index 52beedd..953350a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java @@ -32,6 +32,9 @@ public class NormalDistributionModel { @ApiParam("数据个数") private Integer totalCount; + @ApiParam("数据总数") + private Double totalDataSum; + @ApiParam("平均均值") private Double xbarbar; From f4d7e55f05cb8f0277c401480ba31a97e64d9a44 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 28 Aug 2020 14:59:05 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E5=96=B7=E6=B6=82=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 793f30f..aebd2e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -46,6 +46,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam("方法代码") private String methodCode; + @Column(name = "BATCH_METHOD_CODE") + @ApiParam("批量方法代码") + private String batchMethodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 4b08276..776a6ea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -39,6 +39,10 @@ public class MesMethod extends BaseBean implements Serializable { @ApiParam("方法名称") private String methodName; + @Column(name = "BATCH_METHOD_CODE") + @ApiParam("批量方法名称") + private String batchMethodCode; + @Column(name = "CALL_CLASS") @ApiParam("具体实现类") private String callClass; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java index abf1eff..45ed828 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -19,6 +20,9 @@ public class MesPaintSnPrintModel implements Serializable { @ApiParam("过程条码") private String serialNumber; + @ApiParam("过程条码数组") + private List serialNumberList; + @ApiParam("产品条码") private String produceSn; From df6f0bb4f29f9694d3c1cad1d4f0decc5ab4cd55 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 28 Aug 2020 15:03:50 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 776a6ea..4b08276 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -39,10 +39,6 @@ public class MesMethod extends BaseBean implements Serializable { @ApiParam("方法名称") private String methodName; - @Column(name = "BATCH_METHOD_CODE") - @ApiParam("批量方法名称") - private String batchMethodCode; - @Column(name = "CALL_CLASS") @ApiParam("具体实现类") private String callClass; From 6dd429d32898fed2c2a67a4c4d3827ee6c934cc6 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 28 Aug 2020 15:45:51 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94?= =?UTF-8?q?=E7=A4=BAdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.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/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index dee531b..91e4421 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 @@ -95,7 +95,7 @@ public class ProductOrder extends BaseOrder { @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") - @FieldAnnotation(defaultValue = "true") + @FieldAnnotation(defaultValue = "false", display = false) private Boolean autoSupply; @Column(name="PRODUCT_ROUTING_ID") From a9e97d4e289e2d5660090e4cc62752adc9aff34c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 28 Aug 2020 18:01:06 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E3=80=902688=2008=20extPDA-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9F=A5=E7=9C=8B=E9=9B=B6=E4=BB=B6=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E3=80=91=20=E3=80=902683=2008=20ext=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=93=E5=8D=B0=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=98=BE=E7=A4=BA=E3=80=91=20?= =?UTF-8?q?=E3=80=902682=2008=20ext=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E9=80=89=E6=8B=A9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 52 ++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 30 +++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 72 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 25 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++ 5 files changed, 198 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 8055c00..d904ed9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable { @Transient public String receiveDateTime; + @Transient + @ApiParam("类型名称") + public String busiTypeName; + + @Transient + @ApiParam("物料编号") + public String partNo; + + @ApiParam(value = "标题") + @Transient + public String title; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + + @Transient + @ApiParam("业务类型") + public Integer busiType; + + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value="修改日期查询用，查询起始日期") + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期") + public String modifyDateTimeEnd; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0e3179e..b0dd8a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -248,6 +248,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "替代物料编码") private String subPartNo; + @Transient + @ApiParam(value = "颜色") + private String color; @Transient @ApiParam(value = "替代物料名称") @@ -474,4 +477,31 @@ public class WmsDocMovementDetails extends BaseBean { this.createDatetime = createDatetime; } + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.qty = wmsDocMovementDetails.getQty(); + this.seqNo = wmsDocMovementDetails.getSeqNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.partSpec = wmsDocMovementDetails.getPartSpec(); + this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode(); + this.productionGroup = wmsDocMovementDetails.getProductionGroup(); + this.item = wmsDocMovementDetails.getItem(); + this.planTime = wmsDocMovementDetails.getPlanTime(); + this.planDate = wmsDocMovementDetails.getPlanDate(); + this.unit = wmsDocMovementDetails.getUnit(); + this.custNo = wmsDocMovementDetails.getCustNo(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.srcWhNo = wmsDocMovementDetails.getSrcWhNo(); + this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo(); + this.destWhNo = wmsDocMovementDetails.getDestWhNo(); + this.destZoneNo = wmsDocMovementDetails.getDestZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo(); + this.destAreaNo = wmsDocMovementDetails.getDestAreaNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.color = color; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 21658c2..9aaee96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -277,6 +277,14 @@ public class WmsDocMovementMaster extends BaseBean { public String title; @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value = "父位置号") + private String seqNo; + + @Transient @ApiParam("物料编号组") public String[] partNos; @@ -284,6 +292,42 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("工厂集合") private List organizeCodeList; + @Transient + @ApiParam("物料名称") + public String partNameRdd; + + @Transient + @ApiParam(value = "简称") + private String partSpec; + + @Transient + @ApiParam(value = "工单码") + private String workOrderCode; + + @Transient + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -299,4 +343,32 @@ public class WmsDocMovementMaster extends BaseBean { public WmsDocMovementMaster() { } + public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd, + String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime, + String custName,String custDesc,String custAddr,String custOwner,String custTel) { + + this.id = wmsDocMovementMaster.getId(); + this.orderNo = wmsDocMovementMaster.getOrderNo(); + this.custNo = wmsDocMovementMaster.getCustNo(); + this.organizeCode = wmsDocMovementMaster.getOrganizeCode(); + this.orderStatus = wmsDocMovementMaster.getOrderStatus(); + this.vendorNo = wmsDocMovementMaster.getVendorNo(); + this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo(); + this.seqNo = seqNo; + this.assignSrcZoneNo = assignSrcZoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partSpec = partSpec; + this.workOrderCode = workOrderCode; + this.qty = qty; + this.productionGroup = productionGroup; + this.busiType = busiType; + this.modifyDatetime = modifyDatetime; +// this.color = color; + this.custName = custName; + this.custDesc = custDesc; + this.custAddr = custAddr; + this.custOwner = custOwner; + this.custTel = custTel; + } } 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 1645a74..143f6d8 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 @@ -180,6 +180,10 @@ public class WmsMoveSn extends BaseBean { public String serialSn; @Transient + @ApiParam("客户编号") + public String custNo; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @@ -376,4 +380,25 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } + + public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo, + Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus, + Integer srcSnStatus,Integer destSnStatus ) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.vendorNo = vendorNo; + this.custNo = custNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcQty = srcQty; + this.destQty = destQty; + this.orderNo = orderNo; + this.srcWhNo = srcWhNo; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus;; + } } 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 3a2d468..fd95d7f 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 @@ -3481,4 +3481,23 @@ public class WmsHqlPack { return result; } + + /** + * 字典查询 + * + * @param wmsEnum + * @return + */ + public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result); + + getStringBuilderPack(wmsEnum, result); + + return result; + } } From f0023a2232863076766753f5eb1dc916cba2b366 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 28 Aug 2020 22:11:21 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94?= =?UTF-8?q?=E7=A4=BAdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 99a8d8f..2573b1e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -664,7 +664,6 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_SORT_RULE { - NONE("NONE", "非内置"), ORDER_LET("ORDER_LET", "订单交货期"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), @@ -682,7 +681,8 @@ public class ApsEnumUtil { WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"), - TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"); + TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), + CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); private String value; private String description; From a2eab983d92a88af3a43a87d50a6d05462563475 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 29 Aug 2020 13:01:45 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B1=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=B1=A0=E5=A2=9E=E5=8A=A0jit=5Fseq=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/mes/bean/IfProductOffLine.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index e27e140..397a28c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -143,4 +143,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "JIS_BACKFLUSH_STATUS") @ApiParam("回冲状态") private String jisBackflushStatus; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 25b58db..653bb98 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -47,6 +47,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @ApiParam("缓存类型") private Integer cfgType; + @Column(name = "SEQ") + @ApiParam("排序号") + private Integer seq; + @Transient @ApiParam("当前JIT缓存数") private Integer currentJitCacheNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 5f98f5e..36dd48a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -49,4 +49,8 @@ public class MesJitLockCache extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("状态") private Integer status; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index d764ed1..29f74c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -52,4 +52,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("序号") private Integer seq; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } From 36e90007103d695c42d0abe3bfba49ceea1b16ca Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 29 Aug 2020 15:08:55 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index c9fcfd4..4781543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.engine.rule; -import cn.estsh.i3plus.pojo.wms.bean.WmsZones; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,5 +53,10 @@ public class GenerateLocateRule { */ private boolean orderByAxle; + /** + * 是否空库位 + */ + private boolean isEmptyLocate; + } From 7e678e747d03f2e1ce327e024a5ecfda0bdc6c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 17:18:38 +0800 Subject: [PATCH 12/23] =?UTF-8?q?feat:=E7=A7=BB=E9=99=A4mongo=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8C=81=E4=B9=85=E5=8C=96=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/ImppEnumUtil.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/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 76f1b9b..699ccde 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1251,7 +1251,7 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_STORAGE { - MONGO(1, "MongoDB"), +// MONGO(1, "MongoDB"), ELASTICSEARCH(2, "Elasticsearch"); private int value; private String description; From 8d38a297d2c4902a6965f834a1ea12f27ad4044f Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 29 Aug 2020 18:17:09 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94?= =?UTF-8?q?=E7=A4=BAdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 58997dc..19b52df 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,10 +30,12 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="工作筛选") private String workFilter; + @Lob @Column(name="WORK_SORT") @ApiParam(value ="工作排序") private String workSort; + @Lob @Column(name="RES_SELECT") @ApiParam(value ="资源选择") private String resSelect; From 4dc40c79ddd5e7b124cf97b4a0ee79aaf88ed610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:39:17 +0800 Subject: [PATCH 14/23] =?UTF-8?q?fix:pager.startRow=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index a8731c8..2b2895b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -137,10 +137,10 @@ public class Pager { public int getStartRow() { if(pageSize > 0){ - if(currentPage >= 1){ - return currentPage * pageSize - pageSize; - }else { - return 0; + if (currentPage >= 1) { + startRow = currentPage * pageSize - pageSize; + } else { + startRow = 0; } } return startRow; From 6dc0d94085e409ef70d590683e15ac32964c75a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:41:49 +0800 Subject: [PATCH 15/23] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E5=99=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=8A=A5=E6=96=87=E4=BF=9D=E5=AD=98=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 200ba31..9b21a42 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -108,6 +108,15 @@ public class BsSuitCase extends BaseBean { return isNeedCertification.intValue(); } + @Column(name = "IS_SAVE_EMPTY_MSG") + @ApiParam(value = "是否保存空报文") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isSaveEmptyMsg; + + public int getIsSaveEmptyMsgVal(){ + return isSaveEmptyMsg == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSaveEmptyMsg; + } + @Column(name = "IS_PUSH_MQ") @ApiParam(value = "是否推送MQ") private Integer isPushMQ; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index d67c241..a7d0e35 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.util.List; +import java.util.Map; /** * @Description : 适配记录 @@ -137,6 +138,8 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "脚本结果") private String scriptResult; + /************************************** 临时属性 ***************************************/ + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; @@ -154,6 +157,10 @@ public class BsSuitRecord extends BaseBean { private List bsSuitFileList; @Transient + @ApiParam(value = "日志长文本记录集合<关联类型，记录内容>") + private Map bsLongDataMap; + + @Transient @ApiParam(value = "适配记录报文-查询条件") private String searchMessage; From 7f91f1269c4f3693be5bba37911c8e4c34b6ea9d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 29 Aug 2020 18:55:53 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G?= 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 5e2a4b1..6b4590a 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 @@ -858,7 +858,9 @@ public class WmsEnumUtil { MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), - OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"); + OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), + WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), + WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"); private int value; private String code; From 9be1dd70d595d5ea6980d7a2930d2ba2994b28ab Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 29 Aug 2020 22:39:54 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=20lotno=20=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 67ddf69..dcc76ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -11,11 +11,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -117,6 +113,7 @@ public class WmsCSOrderDetails extends BaseBean { public String vendorNo; @Column(name = "LOT_NO", nullable = false) + @ColumnDefault("") @ApiParam("收货批次") public String lotNo = ""; From b09aa27e0fafd1092a7a1a12d0b767648db1b299 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 29 Aug 2020 23:11:21 +0800 Subject: [PATCH 18/23] =?UTF-8?q?=E6=8E=92=E7=A8=8Bjob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesSchedulingRecord.java | 43 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/TorqueGatherModel.java | 30 +++++++++++++++ .../repository/MesSchedulingRecordRepository.java | 15 ++++++++ 4 files changed, 123 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java 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 52b4025..8b6f1f9 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 @@ -4854,4 +4854,39 @@ public class MesPcnEnumUtil { } } + /** + * 排程记录 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCHEDULING_RECORD_STATUS { + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private Integer value; + private String description; + + SCHEDULING_RECORD_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java new file mode 100644 index 0000000..90dd9f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java @@ -0,0 +1,43 @@ +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 java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 5:11 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCHEDULING_RECORD") +@Api("MES_排程记录表") +public class MesSchedulingRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 5841185737664839362L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java new file mode 100644 index 0000000..05e431f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 10:04 下午 + * @Modify: + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TorqueGatherModel { + + @ApiParam("枪号") + private String torqueNo; + + @ApiParam("扭矩值") + private String torqueValue; + + @ApiParam("扭矩角") + private String torqueAngle; + + @ApiParam("是否合格") + private String isQualified; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java new file mode 100644 index 0000000..f3c1717 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSchedulingRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 5:15 下午 + * @Modify: + */ +@Repository +public interface MesSchedulingRecordRepository extends BaseRepository { +} From f6b812aaf8a737ce1db46947e57a9fa7268e663a Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sun, 30 Aug 2020 19:47:40 +0800 Subject: [PATCH 19/23] =?UTF-8?q?PDA=E7=BB=84=E4=BB=B6=E5=8E=9F=E7=94=9F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=84=9A=E6=9C=AC=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 28efa4f..ec42f52 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -28,8 +28,11 @@ import javax.persistence.Table; @Table(name = "WMS_ACTION_MODULE") @Api("作业步骤处理组件") public class WmsActionModule extends BaseBean { - private static final long serialVersionUID = 9117362998863937579L; + + private static final int TRUE = 1; + private static final int FALSE = 2; + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") @AnnoOutputColumn @@ -63,6 +66,22 @@ public class WmsActionModule extends BaseBean { @ApiParam(value = "作业类型名称") public String opTypeName; + @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2") + @ApiParam(value = "是否脚本组件") + private Integer isScriptModule = FALSE; + + /** + * 是否脚本组件 + * @return + */ + public boolean isScriptModule() { + if (this.isScriptModule != null && this.isScriptModule.intValue() == TRUE) { + return true; + } + + return false; + } + public WmsActionModule() { } From 57aae56345911bccc130118640132a6f04779948 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 31 Aug 2020 14:24:56 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E3=80=902690=20ext=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20-=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsShipModel.java | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java new file mode 100644 index 0000000..caed630 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 委外扣减库存 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-31 9:44 + * @Modify: + **/ +@Data +@Api("委外扣减库存模型") +public class WmsShipModel extends BaseBean { + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam("物料编码") + private String shipPartNo; + + @ApiParam("物料名称") + public String shipPartName; + + @ApiParam("简称及版本") + private String rcPartNo; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("单位") + public String unit; + + @ApiParam("委外发运数量") + public Double shipQty; + + @ApiParam("发运存储区代码") + public String shipZoneNo; + + @ApiParam("ASN收货数量") + private Double rcQty; + + @ApiParam("ASN收货存储区代码") + public String rcZoneNo; + + @ApiParam("委外库存数量") + private Double shipStockQty; + + @ApiParam("委外发运时间") + private String shipTime; + + @ApiParam(value="发运时间，查询起始日期") + public String shipTimeStart; + + @ApiParam(value = "发运时间，查询结束日期") + public String shipTimeEnd; +} From 92f0158dabdbfd26bd7656ea199111582231d381 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 31 Aug 2020 16:16:06 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= 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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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-ptl/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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 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-PROD-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 8ef99a3..f902a7c 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 a6c1bea..d2521de 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-PROD-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 0a2f9d4..b599490 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-PROD-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 5f809e6..aca1465 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 f10cf39..1674a47 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-PROD-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 34a7337..04b40d4 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 ce2dc01..ac387fd 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-PROD-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 b8c9643..bbe0ff9 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-PROD-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 1d29933..be533a6 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-PROD-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 284225c..14e8567 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 353a02b..864c56a 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-PROD-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 b125cee..e755225 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-PROD-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 c9d54a9..194f0cb 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-PROD-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 39f1e2f..60543fe 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-PROD-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 df01041..bdc4cab 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 0cfb344..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From e6b472bcfd0fc42c56b9d55a279de4d3e1452ba5 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 31 Aug 2020 16:49:42 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=B0dev?= 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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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-ptl/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 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 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 f902a7c..650ee5b 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 d2521de..1e17935 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 b599490..37b8a51 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 aca1465..0a44fb0 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 1674a47..123fdc9 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 04b40d4..fdcf6e3 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 ac387fd..60d9861 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 bbe0ff9..54c8306 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 be533a6..190efa7 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 14e8567..5896851 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-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/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 864c56a..80498fc 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 e755225..076f15a 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 194f0cb..1351ed3 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 60543fe..67b0bff 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 bdc4cab..15d36cd 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 cc6131f..f06d17f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 51746154ba4b21b6b78290174340f6f1bb97bbaa Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 31 Aug 2020 17:01:26 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E5=88=B0test?= 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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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-ptl/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 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 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 650ee5b..f902a7c 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 123fdc9..1674a47 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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/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 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 f06d17f..cc6131f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./