Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -8274,11 +8274,12 @@ public class WmsEnumUtil {
 
 
     /**
-     * 自动入库任务类型
+     * 自动入库任务
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AUTO_FORK_TASK_TYPE {
-        MOVE(10, "W05", "W05");
+        START(10, "start", "start"),
+        END(20, "end", "end");
 
         private int value;
         private String code;
@@ -8326,4 +8327,51 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+
+    /**
+     * 发运看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AUTO_FORK_TASK_STATUS {
+        CREATE(10, "新建"),
+        PROCESSING(20, "处理中"),
+        COMPLETE(30, "已完成"),
+        ERROR(40, "处理异常");
+
+        private int value;
+        private String description;
+
+        AUTO_FORK_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static AUTO_FORK_TASK_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+
+/**
+ * @Description : 北京海纳川任务明细
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2018-11-17 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = {
+        @Index(columnList = "TASK_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细")
+public class WmsAutoForkCallBackDetails extends BaseBean {
+    private static final long serialVersionUID = -8103992000562208799L;
+
+    @Column(name = "REQ_CODE")
+    @ApiParam(value = "请求编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String reqCode;
+
+
+    @Column(name = "REQ_TIME")
+    @ApiParam(value = "请求时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String reqTime;
+
+    @Column(name = "CLIENT_CODE")
+    @ApiParam(value = "客服端编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String clientCode;
+
+    @Column(name = "TOKEN_CODE")
+    @ApiParam(value = "令牌号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String tokenCode;
+
+    @Column(name = "INTERFACE_NAME")
+    @ApiParam(value = "接口名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String interfaceName;
+
+    @Column(name = "METHOD")
+    @ApiParam(value = "方法名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String method;
+
+    @Column(name = "TASK_CODE")
+    @ApiParam(value = "任务单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String taskCode;
+
+    @Column(name = "WB_CODE")
+    @ApiParam(value = "工作为")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String wbCode;
+
+    @Column(name = "POD_CODE")
+    @ApiParam(value = "货架编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String podCode;
+
+    @Column(name = "CURRENT_POSITION_CODE")
+    @ApiParam(value = "子任务的位置编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String currentPositionCode;
+
+    @Column(name = "ROBOT_CODE")
+    @ApiParam(value = "执行任务的VGA编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String robotCode;
+
+    //10=新建,20=已处理,30=处理出错
+    @Column(name = "STATUS", nullable = false)
+    @ApiParam("处理标准")
+    public Integer status;
+
+    @Column(name = "REMARK", nullable = false)
+    @ApiParam("备注")
+    public String remark;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsAutoForkCallBackDetails;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Description :北京海纳川回调任务明细
+ * @Reference :
+ * @Author : puxiao.lioa
+ * @CreateDate : 2018-11-13 10:19
+ * @Modify:
+ **/
+@Repository
+public interface WmsAutoForkCallBackDetailsRepository extends BaseRepository<WmsAutoForkCallBackDetails, Long> {
+}