Merge remote-tracking branch 'origin/master'

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

@@ -1811,7 +1811,8 @@ public class WmsEnumUtil {
         LOCATE_SEQ("LOCATE_SEQ", "库位序号"),
         OP_SEQ("OP_SEQ", "作业类型序号"),
         TRAN_SEQ("TRAN_SEQ", "交易类型序号"),
-        STEP_SEQ("STEP_SEQ", "步骤调用序号");
+        STEP_SEQ("STEP_SEQ", "步骤调用序号"),
+        ORDER_NO("ORDER_NO", "盘点主表序号");
 
         private String code;
         private String description;

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 交易类型表
@@ -42,9 +43,13 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "序号", example = "-1")
     private Integer seq;
 
-    @Column(name = "PROG_CODE")
+    @Column(name = "AG_ID")
-    @ApiParam(value = "处理程序", example = "-1")
+    @ApiParam(value = "作业流程", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long agId;
 
+    @Transient
+    @ApiParam("中文流程名称")
+    private String agNameC;
+
 }