excel导出优化--单据状态显示枚举描述

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -66,8 +67,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(hidden = true)
-    //启用停用
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED")

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

@@ -79,8 +79,8 @@ public class WmsCSOrderMaster extends BaseBean {
     public String year;
 
     @Column(name = "IS_SYNC_ERP")
-    @ApiParam("是否同步ERP: 1=已同步，2=未同步")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description")
+    @ApiParam("是否同步ERP")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isSyncErp;
 
     @Transient

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.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;
@@ -56,6 +58,7 @@ public class WmsTaskInfo extends BaseBean {
      */
     @Column(name = "TASK_STATUS")
     @ApiParam(value = "任务状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TASK_INFO_STATUS.class,refForeignKey = "value",value = "description")
     public Integer taskStatus;
 
     @Column(name = "TRANS_TYPE_CODE")
@@ -68,10 +71,12 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_ONE_STEP")
     @ApiParam("是否一步法操作")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isOneStep;
 
     @ApiParam("作业类型名称")
     @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OP_TYPE_CODE.class,refForeignKey = "value",value = "description")
     public String opTypeName;
 
     @ApiParam("作业任务明细")
@@ -80,6 +85,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_CHECK_SN")
     @ApiParam("是否校验条码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
     @Transient