Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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

@@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean {
 
     private static final long serialVersionUID = 9134745988014340144L;
     @Column(name = "LOCATE_NO")
-    @ApiParam(value = "库位代码")
+    @ApiParam(value = "库位编码")
     private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam(value = "物料编码")
+    @ApiParam(value = "物料代码")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")

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

@@ -41,11 +41,11 @@ public class WmsTransType extends BaseBean {
     private String transTypeName;
 
     @Column(name = "SEQ")
-    @ApiParam(value = "序号", example = "-1")
+    @ApiParam(value = "序号")
     private Integer seq;
 
     @Column(name = "AG_ID")
-    @ApiParam(value = "作业流程", example = "-1")
+    @ApiParam(value = "作业流程")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long agId;
 
@@ -66,10 +66,19 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "PDA图标")
     private String pdaIcon;
 
+    @Column(name = "IS_SEND_ERROR_EMAIL", columnDefinition = "int default 2")
+    @ApiParam(value = "是否发送异常邮件")
+    private Integer isSendErrorEmail;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
 
+    @Transient
+    @ApiParam("交易处理组件调用类")
+    private String callClass;
+
+
     public String getMenuUrl() {
         return "/handle?transTypeCode=" + this.transTypeCode;
     }