Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -2519,4 +2519,12 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_DATA_SOURCE_TYPE {
+        MASTER,NODE
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2565,6 +2565,7 @@ public class MesPcnEnumUtil {
         CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
+        IMAGE_LIST("image_list", "图片列表"),
         SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
 
         private String value;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -403,8 +403,8 @@ public final class FormHqlPack {
     public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade);
 
-        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
     @Column(name = "PROCESS_LABEL_TEMPLATE")
     @ApiParam("过程标签模板")
     private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java

@@ -83,4 +83,8 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @ApiParam(value = "已完成数量")
     @Transient
     private Integer finishQty;
+
+    @ApiParam(value = "检测项类型名称")
+    @Transient
+    private String businessTypeName;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-29 下午3:40
+ * @Modify:
+ **/
+@Data
+public class ThreadModel implements Serializable {
+
+    @ApiParam(value ="自定义调用ID")
+    private Long requestId;
+    @ApiParam(value ="当前用户ID")
+    private Long userId;
+    @ApiParam(value ="当前用户名称")
+    private String userName;
+    @ApiParam(value ="用户登录IP")
+    private String userHost;
+    @ApiParam(value ="用户登录浏览器")
+    private String userBrowser;
+    @ApiParam(value ="用户登录操作系统")
+    private String userOs;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean {
 
     @Column(name="LOG_PID")
     @ApiParam(value ="应用PID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long logPid;
 
     @Column(name="LOG_PORT")
@@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean {
     private String userLoginName;
 
     /******** 日志信息 ********/
+    @Column(name="REQUEST_ID")
+    @ApiParam(value ="请求ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
 
     @Column(name="EXECUTE_THREAD_ID")
     @ApiParam(value ="执行线程")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_CSS_STYLE")
+@Api(value="自定义样式")
+public class BrCssStyle extends BaseBean {
+
+    private static final long serialVersionUID = 8651392479116992679L;
+
+    @Column(name="STYLE_CODE")
+    @ApiParam(value ="样式编码")
+    private String styleCode;
+
+    @Column(name="STYLE_CONTENT")
+    @ApiParam(value ="样式内容")
+    private String styleContent;
+
+    @Column(name="STYLE_DESCRIPTION")
+    @ApiParam(value ="样式描述")
+    private String styleDescription;
+
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrCssStyle;
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface BrCssStyleRepository extends BaseRepository<BrCssStyle,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;
 
-    @Column(name = "RESULT_SOFT_TYPE")
+    @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0")
     @ApiParam(value = "同步调用微服务")
     private Integer resultSoftType;
     public String getResultSoftTypeTxt() {

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java

@@ -46,6 +46,12 @@ public class BsSuitCaseREST extends BaseBean {
     @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
+    //CommonEnumUtil.TRUE_OR_FALSE
+    @Column(name = "IS_REQUEST_BODY")
+    @ApiParam(value = "是否使用requestBody")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isRequestBody;
+
     @Transient
     @ApiParam(value = "请求头转换")
     private List<BsSuitCaseParam> requestHeaderList;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java

@@ -42,6 +42,11 @@ public class WmsBhChildDetectionItem extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemCheckName;
 
+    @Column(name = "CHECK_TYPE_CODE")
+    @ApiParam("检测大类")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    public String checkTypeCode;
+
     @Column(name = "VALUE_TYPE")
     @ApiParam("值类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -663,7 +663,7 @@ public class WmsStockSn extends BaseBean {
                       String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime,
                       String modifyUser, String modifyDatetime) {
         this.organizeCode = organizeCode;
-        this.batchNo = partNo;
+        this.batchNo = batchNo;
         this.sn = sn;
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2923,6 +2923,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result);
         DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result);
+        DdlPreparedPack.getStringEqualPack(item.getCheckTypeCode(), "checkTypeCode", result);
 
         getStringBuilderPack(item, result);
 

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