Merge branch 'test' into ext-dev

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++) {

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;
 }

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;
 }

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;
 }

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;
 }

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;

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;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java

@@ -97,6 +97,10 @@ public class StepResult<T> {
         return new StepResult<>(true, data, "", nextTriggerEvent);
     }
 
+    public static <T> StepResult<T> getNewFailureData(T data, String nextTriggerEvent) {
+        return new StepResult<>(false, data, "", nextTriggerEvent);
+    }
+
     public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
         return new StepResult<T>(true, data, msg);
     }

modules/i3plus-pojo-screen/pom.xml

@@ -16,7 +16,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

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;
 
 }

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;
+
 
 }

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;
 }

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;
 

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<ScrDataObject> dataObjects;
+
+    @ApiModelProperty("model对应的数据对象索引")
+    private List<ScrDataObjectIndex> dataObjectIndices;
+
     @ApiModelProperty("model字段")
     private List<ScrModelField> modelFields;
 
-    @ApiModelProperty("model字段约束")
+    @ApiModelProperty("model字段索引")
-    private List<ScrModelFieldIndex> modelFieldConstraints;
+    private List<ScrModelFieldIndex> modelFieldIndices;
 
     @ApiModelProperty("model虚拟字段")
     private List<ScrModelFieldVirtual> modelFieldVirtuals;
 
-    @ApiModelProperty("model对应的数据对象")
+    private List<ScrModelField> insertCondition;
-    private List<ScrDataObject> dataObjects;
+
+    private List<ScrModelField> queryCondition;
+
+    private List<ScrModelField> updateCondition;
+
+    private List<ScrModelField> deleteCondition;
 
 }

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<ScrModelField> modelFields;
+}

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;

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;

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<String> fields;
+
     @ApiModelProperty("查询参数")
     private Map<String, Object> searchParams;
 
@@ -59,8 +62,8 @@ public class ScrSqlDmlModel implements Serializable {
     @ApiModelProperty("数据源")
     private ScrDatasource datasource;
 
-    @Deprecated
+    @ApiModelProperty("主键")
-    @ApiModelProperty("model与数据对象的model")
+    private Map<String, Object> primaryKeys;
-    private ScrModelDataObjectModel modelDataObjectModel;
+
 
 }

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;
 }

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-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./