From 95ac5f0ee3a01bd42893c12eac305f17d586757d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 17 May 2021 19:09:08 +0800 Subject: [PATCH 01/19] =?UTF-8?q?feat(screen):=20jdbc=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=20=E5=BE=85=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jdbc拼接初步完成 待整理代码 --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 47 ++++++++++++++ modules/i3plus-pojo-screen/pom.xml | 5 +- .../estsh/i3plus/pojo/screen/bean/ScrAction.java | 6 +- .../i3plus/pojo/screen/bean/ScrModelField.java | 9 +-- .../pojo/screen/bean/ScrModelFieldIndex.java | 10 +++ .../pojo/screen/model/ScrDataObjectIndexModel.java | 4 +- ...elDataObjectModel.java => ScrExecuteModel.java} | 29 +++++++-- .../i3plus/pojo/screen/model/ScrRequestModel.java | 71 ++++++++++++++++++++++ .../pojo/screen/model/ScrRowColumnModel.java | 4 +- .../i3plus/pojo/screen/model/ScrSqlDdlModel.java | 2 +- .../i3plus/pojo/screen/model/ScrSqlDmlModel.java | 9 ++- 11 files changed, 178 insertions(+), 18 deletions(-) rename modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/{ScrModelDataObjectModel.java => ScrExecuteModel.java} (63%) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java index c4f794e..2a1a32a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -105,6 +105,43 @@ public class ScreenEnumUtil { } } + public enum ACTION_TYPE { + FRONT(10, "FRONT", "前端"), + BACKEND(20, "BACKEND", "后端"); + + private Integer value; + private String code; + private String description; + + ACTION_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + public enum NULLABLE { YES(10, "YES", "允许为空"), NO(20, "NO", "不允许为空"); @@ -351,6 +388,16 @@ public class ScreenEnumUtil { return tmp; } + public static ACTION codeOfEnum(String code) { + ACTION tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equalsIgnoreCase(code)) { + tmp = values()[i]; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 79bae9c..b926256 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -17,7 +17,10 @@ i3plus.pojo i3plus-pojo-base - + + org.springframework + spring-web + diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java index a7d22c0..25e3878 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -13,6 +14,8 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -42,6 +45,7 @@ public class ScrAction extends BaseBean implements Serializable { @Column(name = "ACTION_TYPE") @ApiModelProperty("动作类型") - private String actionType; + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.ACTION_TYPE actionType; } \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index f98312b..67b3e8f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -15,6 +16,7 @@ import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -89,10 +91,6 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("是否是虚拟的") private Boolean isVirtual; - @Column(name = "VIRTUAL_SPEL") - @ApiModelProperty("SPEL表达式虚拟属性") - private String virtualSpel; - @Column(name = "MODEL_FIELD_DATASOURCE") @ApiModelProperty("字段数据来源") @Enumerated(EnumType.STRING) @@ -106,5 +104,8 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("数据列权限") private String dataRowAuth; + @Transient + private Object fieldValue; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java index 0bea2b4..3e4130e 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java @@ -55,4 +55,14 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable { @ApiModelProperty("是否是用户创建的") @Enumerated(EnumType.STRING) private CommonEnumUtil.TRUE_OR_FALSE isUserCreated; + + @Column(name = "PRIMARY_KEY_SWITCH") + @ApiModelProperty("model主键唯一检查开关") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch; + + @Column(name = "UNIQUE_KEY_SWITCH") + @ApiModelProperty("model唯一键唯一检查开关") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java index a301394..7b9f2b7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; import lombok.Builder; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -15,7 +16,8 @@ import java.util.List; */ @Data @Builder -public class ScrDataObjectIndexModel { +public class ScrDataObjectIndexModel implements Serializable { + private static final long serialVersionUID = -5784177094937410041L; private ScrDatasource datasource; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrModelDataObjectModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java similarity index 63% rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrModelDataObjectModel.java rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java index 089c5e1..567eb5e 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrModelDataObjectModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.screen.model; +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex; import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; import cn.estsh.i3plus.pojo.screen.bean.ScrModel; import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; @@ -11,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -24,25 +27,39 @@ import java.util.List; @Builder @AllArgsConstructor @ApiModel("model，modelFields与数据对象，数据源的关系") -public class ScrModelDataObjectModel implements Serializable { +public class ScrExecuteModel implements Serializable { private static final long serialVersionUID = -7305897999888994870L; - @ApiModelProperty("Model") + @ApiModelProperty("动作") + private ScrAction action; + + @ApiModelProperty("模型") private ScrModel model; @ApiModelProperty("数据源") private ScrDatasource datasource; + @ApiModelProperty("model对应的数据对象") + private List dataObjects; + + @ApiModelProperty("model对应的数据对象索引") + private List dataObjectIndices; + @ApiModelProperty("model字段") private List modelFields; - @ApiModelProperty("model字段约束") - private List modelFieldConstraints; + @ApiModelProperty("model字段索引") + private List modelFieldIndices; @ApiModelProperty("model虚拟字段") private List modelFieldVirtuals; - @ApiModelProperty("model对应的数据对象") - private List dataObjects; + private List insertCondition; + + private List queryCondition; + + private List updateCondition; + + private List deleteCondition; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java new file mode 100644 index 0000000..4fe5aaa --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/5/14 09:58 + * @desc + */ +@Data +@ApiModel("请求model") +public class ScrRequestModel implements Serializable { + private static final long serialVersionUID = -4119744678742689856L; + + @ApiModelProperty("工厂代码") + private String organizeCode; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("页面代码") + private String screenCode; + + @ApiModelProperty("容器代码") + private String panelCode; + + @ApiModelProperty("模型") + private String modelCode; + + @ApiModelProperty("动作") + private String actionCode; + + @ApiModelProperty("分页") + private Pager pager; + + @ApiModelProperty("下载文件Id") + private Long downloadFileId; + + @ApiModelProperty("跳转参数") + private String redirectUrl; + + @ApiModelProperty("跳转参数") + private String enumName; + + @ApiModelProperty("目标系统") + private CommonEnumUtil.SOFT_TYPE targetSystem; + + @ApiModelProperty("包名") + private String packageName; + + @ApiModelProperty("类名") + private String className; + + @ApiModelProperty("方法名") + private String methodName; + + @ApiModelProperty("上传文件") + private MultipartFile file; + + @ApiModelProperty("模型字段") + private List modelFields; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java index 03bebb0..12f782b 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -15,7 +16,8 @@ import java.util.List; */ @Data @ApiModel("行列Model") -public class ScrRowColumnModel { +public class ScrRowColumnModel implements Serializable { + private static final long serialVersionUID = 7450630220924238356L; @ApiModelProperty("行") private ScrLayoutRow row; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java index c7dd9bf..bce824f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java @@ -14,8 +14,8 @@ import java.util.List; **/ @Data public class ScrSqlDdlModel implements Serializable { - private static final long serialVersionUID = -1294648161172538340L; + private String tableCat; private String tableSchem; private String tableName; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java index 50fa59d..85c65cf 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java @@ -35,6 +35,9 @@ public class ScrSqlDmlModel implements Serializable { @ApiModelProperty("表名或视图名") private String table; + @ApiModelProperty("字段") + private List fields; + @ApiModelProperty("查询参数") private Map searchParams; @@ -59,8 +62,8 @@ public class ScrSqlDmlModel implements Serializable { @ApiModelProperty("数据源") private ScrDatasource datasource; - @Deprecated - @ApiModelProperty("model与数据对象的model") - private ScrModelDataObjectModel modelDataObjectModel; + @ApiModelProperty("主键") + private Map primaryKeys; + } From 524a766dd5d71be526a1a79a736e4741be4d6f84 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 18 May 2021 14:47:50 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=B8=AD=E8=88=AASPC=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9B=B6=E4=BB=B6=E5=8F=B7=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/MesSpcKeyData.java | 4 ++++ 1 file changed, 4 insertions(+) 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 index 5774c72..7ed0599 100644 --- 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 @@ -74,4 +74,8 @@ public class MesSpcKeyData extends BaseBean implements Serializable { @Column(name = "KD_CONDITION") @ApiParam("取值条件") private String kdCondition; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; } From 95d72cf4af9e7144c225619168391b0ce7f02d45 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 19 May 2021 17:07:16 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=AA=E5=BE=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 567b256..30418b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -90,4 +92,95 @@ public class WmsTransSn extends BaseBean { @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") private Integer snStatus; + + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "交易数量") + public Double transQty; + + @Column(name = "SRC_PART_NO") + @ApiParam("源物料编码") + public String srcPartNo; + + @Column(name = "NEW_PART_NO") + @ApiParam("新物料编码") + public String newPartNo; + + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "源数量") + public Double srcQty; + + @Column(name = "NEW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "新数量") + public Double newQty; + + @Column(name = "SRC_SN_STATUS") + @ApiParam(value = "源条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + public Integer srcSnStatus; + + @Column(name = "NEW_SN_STATUS") + @ApiParam(value = "目的条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + public Integer newSnStatus; + + @Column(name = "SRC_QC_STATUS") + @ApiParam(value = "源质量状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + public Integer srcQcStatus; + + @Column(name = "NEW_QC_STATUS") + @ApiParam(value = "目的质量状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + public Integer descQcStatus; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "NEW_WH_NO") + @ApiParam("新仓库代码") + public String newWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "NEW_ZONE_NO") + @ApiParam("新存储区代码") + public String newZoneNo; + + @Column(name = "NEW_LOCATE_NO") + @ApiParam("新库位代码") + public String newLocateNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "SRC_ORGANIZE_CODE") + @ApiParam("源工厂代码") + public String srcOrganizeCode; + + @Column(name = "NEW_ORGANIZE_CODE") + @ApiParam("新工厂代码") + public String newOrganizeCode; + + @Column(name = "SRC_IS_DELETED") + @ApiParam("旧软删标识") + public Integer srcIsDeleted; + + @Column(name = "NEW_IS_DELETED") + @ApiParam("新软删标识") + public Integer newIsDeleted; + + @Column(name = "SRC_IS_VALID") + @ApiParam("旧有效标识") + public Integer srcIsValid; + + @Column(name = "NEW_IS_VALID") + @ApiParam("新有效标识") + public Integer newIsValid; } From 40d7dbff22b308abea08e7ac48994c8fbc426631 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 21 May 2021 16:13:17 +0800 Subject: [PATCH 04/19] =?UTF-8?q?15957=2020027-PCN=E7=AB=AF-=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C&=E5=8F=91=E8=B4=A7=E6=A3=80?= =?UTF-8?q?=E9=AA=8C-=E5=BD=B1=E8=97=8F=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=88=97&=E5=88=A4=E5=AE=9A=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E8=A6=81=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5-20210521?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java index e4d935c..c68b244 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java @@ -19,7 +19,7 @@ public class MesQcOrderDetailRecordModel implements Serializable { private String orderNo; @ApiParam("判定结果") - private Integer checkResult = 0; + private String checkResult; @ApiParam("检测值") private String checkValue; From ae71f6a008f3d4a432417e5ba4aca53b90405498 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 16:46:26 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 06aec88..44c290b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -94,6 +94,9 @@ public class StationRequestBean implements Serializable { @ApiParam("强制跳过工序") private Boolean forceJumpProcess = false; + @ApiParam("自动执行状态机") + private Boolean triggerAutoFsm = false; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 1a8f7c8..9a15c9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -97,6 +97,10 @@ public class StepResult { return new StepResult<>(true, data, "", nextTriggerEvent); } + public static StepResult getNewFailureData(T data, String nextTriggerEvent) { + return new StepResult<>(false, data, "", nextTriggerEvent); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); } From 5d33795cffc7a58a3d341e9f5694641562b51721 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 16:58:23 +0800 Subject: [PATCH 06/19] test merge dev --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-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-screen/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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0272934..b2dbbd1 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 b948580..a9e288f 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 cf1a42a..17f3171 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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 4988104..bef0b07 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..6bef2bc 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 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 0f615b6..0368700 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 183a03c..d221913 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 0fea52b..5fcd08a 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 f8d2d25..f250672 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 diff --git a/sonar-project.properties b/sonar-project.properties index a232d36..8c37b31 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0.0.1 +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 56ed9e73f29c520538a153c7f808bad3d38b9df6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 17:17:35 +0800 Subject: [PATCH 07/19] =?UTF-8?q?ctno=20=E5=A2=9E=E5=8A=A0=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E5=BF=97=20=E6=9D=BE=E4=B8=8Bwms=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=98=A0=E5=B0=84=E9=9C=80=E8=A6=81=E6=AD=A4=E5=AD=97?= =?UTF-8?q?=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/MesContainer.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index d7d7073..70ef63e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -63,4 +63,8 @@ public class MesContainer extends BaseBean { @Column(name = "TIME_SECOND") @ApiParam(value = "处理时间(秒)") private String timeSecond; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java index c0f1d12..51e7f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -55,4 +55,8 @@ public class MesContainerType extends BaseBean { @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") private String limitUom; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java index efc1077..01036e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -48,4 +48,8 @@ public class MesPartContainerCapacity extends BaseBean { @Column(name = "CT_QTY") @ApiParam(value = "容量") private Integer ctQty; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; } From 15dc951bf16c11ef8e2128e8bf38c3fff70bfb62 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 17:20:58 +0800 Subject: [PATCH 08/19] dev merge test --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-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-screen/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/pom.xml b/modules/i3plus-pojo-base/pom.xml index b2dbbd1..0272934 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 a9e288f..b948580 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 17f3171..cf1a42a 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 bef0b07..4988104 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 6bef2bc..48930f8 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 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 0368700..0f615b6 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 d221913..183a03c 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 5fcd08a..0fea52b 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 f250672..f8d2d25 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 diff --git a/sonar-project.properties b/sonar-project.properties index 8c37b31..37d8ae0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo 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=./ From 7a39ef9a355f5025a71a9db8d9f9caa3d854b593 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 17:26:49 +0800 Subject: [PATCH 09/19] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 37d8ae0..a232d36 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0.0.1 # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 32e4bb4ba7112e4c9d86c91dad21385666bff7d2 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:14:37 +0800 Subject: [PATCH 10/19] =?UTF-8?q?15872=2020027--PCN=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 41 ++++++++++------------ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 +-- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index 3ad988c..71152d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { private static final long serialVersionUID = 6727925715356900171L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 - @Column(name = "DB_CHECK_ITEM") - @ApiParam("DB复核项") - private String dbCheckItem; - @Column(name = "ERROR_FILED_CODE") @ApiParam("异常取值字段") private String errorFiledCode; - @Column(name = "ERROR_DESC") - @ApiParam("异常描述") - private String errorDesc; + @Column(name = "ERROR_FILED_DESC") + @ApiParam("异常取值字段描述") + private String errorFiledDesc; + + //10数字、20字符串 + @Column(name = "ERROR_FILED_TYPE") + @ApiParam("异常取值字段类型") + private String errorFiledType; + + @Column(name = "ERROR_FILED_VALUE") + @ApiParam("异常取值字段值") + private String errorFiledValue; - @Column(name = "PRODUCT_DATA_ID") - @ApiParam("生产记录表主键ID") - private Long productDataId; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码（第三方库表名）") + private String objectCode; - //是否停线：1=是，2=否 - @Column(name = "IS_STOP_LINE") - @ApiParam("是否停线") - private Integer isStopLine; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; - //审批状态：10=待审批，20=已审批 - @Column(name = "STATUS") - @ApiParam("审批状态") - private Integer status; @Transient @ApiParam("按钮名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 15049c3..139b5f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -341,7 +341,7 @@ public class MesPcnHqlPack { return packBean; } - public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { + /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean); @@ -362,7 +362,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean); } return packBean; - } + }*/ /** * 按条件分页查询产品条码补打印数据 From 792d4263c50e2ffe74629f6e694422ff71368e46 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:18:01 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86=EF=BC=8Ckettle?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=B7=A5=E5=85=B7=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 7a56fa4..64587ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -122,4 +122,9 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; + + //枚举：MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index daa66a8..f96c3b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -107,4 +107,9 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("客户发运地") private String custDelieryLocation; + //枚举：MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; + } From 17a61b2c2b9176f1aca7bcaca574c56f141d29eb Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:38:18 +0800 Subject: [PATCH 12/19] =?UTF-8?q?15607=2020027-PCN=E7=AB=AF=20-=20?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A1=E6=95=B0=20-20210429?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 78c3128..113c25f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -125,7 +125,7 @@ public class MesQcOrder extends BaseBean implements Serializable { @Column(name = "ON_SITE_FREQUENCY") @ApiParam("巡检次数") - private Integer onSiteFrequency = 0; + private Integer onSiteFrequency = 1; @Deprecated @ApiParam(value = "检测结果") From e8fdaa58be175788a682815f2ea0fcde3ee4b6c5 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 25 May 2021 11:07:54 +0800 Subject: [PATCH 13/19] =?UTF-8?q?15872=2020027--PCN=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22=20simon.song=202021/5/2?= =?UTF-8?q?4=20=E4=B8=8B=E5=8D=886:14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java | 32 ++++++++++------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java index be378c2..fe10ed1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -40,33 +40,29 @@ public class MesDbDataCheck extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 - @Column(name = "DB_CHECK_ITEM") - @ApiParam("DB复核项") - private Integer dbCheckItem; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") + @ApiParam("对象代码（第三方库表名）") private String objectCode; - //是否停线：1=是，2=否 - @Column(name = "IS_STOP_LINE") - @ApiParam("是否停线") - private Integer isStopLine; - - @Column(name = "KEY_DATA_FILED") - @ApiParam("质量关键字段") - private String keyDataFiled; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; @Column(name = "QC_FILED_CODE") - @ApiParam("缺陷类型字段") + @ApiParam("质检取值字段") private String qcFiledCode; + @Column(name = "QC_FILED_DESC") + @ApiParam("质检取值字段描述") + private String qcFiledDesc; + + @Column(name = "QC_FILED_TYPE") + @ApiParam("质检取值字段类型") + private String qcFiledType; + @Column(name = "QC_FILED_VALUE") @ApiParam("缺陷类型合格值") private String qcFiledValue; - @Column(name = "QC_FAIL_MAX_COUNT") - @ApiParam("缺陷连续不合格预警次数") - private String qcFailMaxCount; + } From 804f9240ccd4166b037cebbdb234d2ceaf23513a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Tue, 25 May 2021 13:53:14 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E9=9B=B6=E6=98=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E4=BA=BA=EF=BC=88=E5=89=8D3=E4=B8=AA=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=9E=9A=E4=B8=BE=EF=BC=89=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=B7=EF=BC=88=E8=B0=83=E7=94=A8=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=89=20=E9=9B=B6=E6=98=9F=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=20=20=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 8af332a..de0b0aa 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 @@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REASON") + @ApiParam("原因") + public String reason; + + @Column(name = "DEPARTMENT") + @ApiParam(value = "部门") + private String department; + + @Column(name = "RECEIVER") + @ApiParam("领用人") + private String receiver; + + @Column(name = "PROD_DFG_TYPE_CODE") + @ApiParam("项目号") + private String prodCfgTypeCode; @Transient private List movementDetailsList; From bddf876ee3ca5b3d6ac93461330fde215c8b3bff Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 25 May 2021 15:18:14 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=20doFunction=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 7072531..be8a0ec 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 @@ -3693,6 +3693,7 @@ public class MesPcnEnumUtil { WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"), WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"), WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"), + WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"), WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"), WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件"); From 2d2faaaa4c955e66051159060fe5586670595d9c Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Tue, 25 May 2021 16:17:20 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index a76974a..c24359e 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -36,7 +36,7 @@ public abstract class BaseMdmBean extends BaseBean { @Column(name = "MDM_VERSION") @ApiParam("当前版本") @JsonSerialize(using = ToStringSerializer.class) - private Long mdmVersion; + public Long mdmVersion; public long getMdmVersionVal() { return mdmVersion == null ? 0 : mdmVersion; From 3a3bdc664acc209b8c51b4e4ec25e0131be1dff7 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 26 May 2021 11:12:18 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E7=95=8C=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index c7693dd..dcc126a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 6c4e2ba..f7736e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool; public class APSDoubleTool { public static boolean isZero(Double value) { - return (value == null) || (value > -0.000001 && value < 0.000001); + return (value == null) || (value > -0.0000001 && value < 0.0000001); } } From 3d66e54ceafbf96682c754ec08bb84a68668fd4f Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 26 May 2021 16:03:11 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=B8=AD=E9=97=B4=E8=AE=A1=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../src/main/resources/relations/InterMediateResult.xml | 2 -- modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 8368fd4..87d59be 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS { private static final long serialVersionUID = -1869359887027950540L; @Column(name="WORK_ID") - @ApiParam(value ="工作") + @ApiParam(value ="工作编码") @FieldAnnotation(relation = "Work") private Long workId; @@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS { } @JsonBackReference - public List getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); } + public List getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index dcc126a..a5618c5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; @@ -265,4 +266,7 @@ public class Work extends BaseAPS { this.originWorkId = work != null ? work.getId() : 0; BeanRelation.set(this, EWork.OriginWork, work); } + + @JsonBackReference + public List getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index decabfa..006a0e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -19,6 +19,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; +import java.util.List; /** * @Description :工作计划 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 70d265e..25c90c3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -15,4 +15,5 @@ public enum EWork { SpecifyResource, // 指定资源 DynSplitWorks, // 动态拆分后的工作 OriginWork, // 动态拆分前的工作 + EvaluateResult, // 资源评估结果 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml index 6b7a99d..87c0210 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml @@ -1,7 +1,5 @@ - - diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index da892ce..5663143 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -22,4 +22,6 @@ + + \ No newline at end of file From 8abe9cb030b39d37fc6e0447271b087b9e7e8867 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 27 May 2021 17:47:54 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mdm/repository/master/MdmfieldRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java new file mode 100644 index 0000000..3ed4cc5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-05-26 20:33 + * @Modify: + **/ +@Repository +public interface MdmfieldRepository extends BaseRepository { +}