Merge branch 'test' into dev

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/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-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=./