Merge branch 'test' of shun.cui/i3plus-pojo into test

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

@@ -9585,6 +9585,43 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * TIME_STATUS
+     */
+    public enum TIME_STATUS {
+        NORMAL(1,"正常"),
+        TIME_OUT(2,"超时");
+
+        private int value;
+        private String description;
+
+        TIME_STATUS(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
 
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+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;
@@ -20,6 +22,7 @@ public class JisReportModel extends BaseBean {
     @ApiParam("实际发货数量")
     private Double actualShipingCount;
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description")
     private Integer shippingStatus;
     @ApiParam("料架号1")
     private String queueGroupNo_1;