Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

2021-11-18 11:21:27 +08:00
parent 3748f3321e 1766eae057
commit aecf651292
212 changed files with 1148 additions and 244 deletions
--- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/CommunicationContrallor.java
+++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/CommunicationContrallor.java
@@ -0,0 +1,51 @@
+package com.mt.wms.basic.controller;
+
+import com.mt.wms.basic.params.CommunicationQueryParam;
+import com.mt.wms.basic.service.CommunicationService;
+import com.mt.wms.basic.vo.CommunicationVo;
+import com.mt.wms.core.base.BaseController;
+import com.mt.wms.core.constants.CommonConstant;
+import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.validator.groups.PageGroup;
+import com.mt.wms.core.vo.PageVo;
+import com.mt.wms.core.vo.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.groups.Default;
+import java.util.List;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/11/18 10:34
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping(CommonConstant.API_MODULE_BASE + "communication")
+@Slf4j
+@Api(value = "通讯日志管理", tags = "通讯日志管理", hidden = false)
+public class CommunicationContrallor extends BaseController {
+
+    @Autowired
+    private CommunicationService communicationService;
+
+    @PostMapping(value = "get")
+    @ApiOperation(value = "获取报警基础信息")
+    private R<CommunicationVo> get(@Validated @RequestBody IdParam idParam) {
+        return communicationService.get(idParam);
+    }
+
+
+    @PostMapping(value = "page")
+    @ApiOperation(value = "获取分页报警基础信息")
+    private R<PageVo<CommunicationVo>> page(@Validated({PageGroup.class, Default.class}) @RequestBody CommunicationQueryParam communicationQueryParam) {
+        return communicationService.page(communicationQueryParam);
+    }
+}
--- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/CommunicationQueryParam.java
+++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/params/CommunicationQueryParam.java
@@ -0,0 +1,31 @@
+package com.mt.wms.basic.params;
+
+import com.mt.wms.core.params.BasePageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/11/18 10:13
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "通讯日志查询参数", description = "用于查询通讯日志")
+public class CommunicationQueryParam extends BasePageParam {
+    /**
+     * 主键，自增
+     */
+    @ApiModelProperty(value = "主键",required = false, example = "1")
+    private Long id;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型",required = false, example = "1")
+    private Integer type;
+}
--- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/service/CommunicationService.java
+++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/service/CommunicationService.java
@@ -0,0 +1,32 @@
+package com.mt.wms.basic.service;
+
+import com.mt.wms.basic.params.CommunicationQueryParam;
+import com.mt.wms.basic.vo.CommunicationVo;
+import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.vo.PageVo;
+import com.mt.wms.core.vo.R;
+
+import java.util.List;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/11/18 10:16
+ * @Version 1.0
+ */
+public interface CommunicationService {
+    /**
+     * 获取xx
+     *
+     * @param idParam 主键参数
+     * @return xx
+     */
+    R<CommunicationVo> get(IdParam idParam);
+
+    /**
+     * 获取xx分页列表
+     *
+     * @param kilnInfoQueryParam xx查询参数
+     * @return xx分页列表
+     */
+    R<PageVo<CommunicationVo>> page(CommunicationQueryParam kilnInfoQueryParam);
+}
--- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/service/impl/CommunicationServiceImpl.java
+++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/service/impl/CommunicationServiceImpl.java
@@ -0,0 +1,51 @@
+package com.mt.wms.basic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mt.wms.basic.params.CommunicationQueryParam;
+import com.mt.wms.basic.service.CommunicationService;
+import com.mt.wms.basic.vo.AlarmBaseVo;
+import com.mt.wms.basic.vo.CommunicationVo;
+import com.mt.wms.core.api.Assert;
+import com.mt.wms.core.base.BaseService;
+import com.mt.wms.core.dal.entity.CommunicationLog;
+import com.mt.wms.core.dal.service.CommunicationLogServiceBiz;
+import com.mt.wms.core.errorcode.ApiErrorCode;
+import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.utils.StringUtils;
+import com.mt.wms.core.vo.PageVo;
+import com.mt.wms.core.vo.R;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/11/18 10:18
+ * @Version 1.0
+ */
+@Service
+@Transactional
+public class CommunicationServiceImpl extends BaseService implements CommunicationService {
+    @Resource
+    private CommunicationLogServiceBiz communicationLogServiceBiz;
+    @Override
+    public R<CommunicationVo> get(IdParam idParam) {
+        Assert.notNull(ApiErrorCode.INVALID_PARAMETER,idParam.getId());
+        CommunicationLog communicationLog = communicationLogServiceBiz.getById(idParam.getId());
+        CommunicationVo communicationVo = CommunicationVo.builder().build();
+        BeanUtils.copyProperties(communicationLog,communicationVo);
+        return successful(communicationVo);
+    }
+
+    @Override
+    public R<PageVo<CommunicationVo>> page(CommunicationQueryParam communicationQueryParam) {
+        QueryWrapper<CommunicationLog> wrapper=new QueryWrapper<>();
+        wrapper.eq(CommunicationLog.VALID,1);
+        wrapper.eq(communicationQueryParam.getType()!=null,CommunicationLog.TYPE,communicationQueryParam.getType());
+        Page<CommunicationLog> page = communicationLogServiceBiz.page(new Page<>(communicationQueryParam.getCurrent(), communicationQueryParam.getSize()), wrapper);
+        return successful(new PageVo<>(page,CommunicationVo.class));
+    }
+}
--- a/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/CommunicationVo.java
+++ b/6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/CommunicationVo.java
@@ -0,0 +1,61 @@
+package com.mt.wms.basic.vo;
+
+import com.mt.wms.core.base.BaseVo;
+import com.mt.wms.core.vo.PageVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/11/18 8:55
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@Builder
+@ApiModel(value = "通讯日志视图对象", description = "用于查询通讯日志信息")
+public class CommunicationVo extends BaseVo implements PageVo.ConvertVo {
+    /**
+     * 主键，自增
+     */
+    @ApiModelProperty(value = "主键，更新时需要填写", example = "1")
+    private Long id;
+
+    /**
+     * 编码
+     */
+    @ApiModelProperty(value = "编码", example = "1")
+    private String  code;
+
+    /**
+     * 日志名称
+     */
+    @ApiModelProperty(value = "日志名称", example = "1")
+    private String logName;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "日志名称", example = "1")
+    private String content;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", example = "1")
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", example = "1")
+    private LocalDateTime createTime;
+}
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AlarmBase.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AlarmBase.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AlarmInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AlarmInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CommunicationLog.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CommunicationLog.java
@@ -0,0 +1,125 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 通讯日志信息 包括wcs与wms  apms与wms相互通讯
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_communication_log")
+public class CommunicationLog extends Model<CommunicationLog> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用，2停止
+     */
+    @TableField("valid")
+    @TableLogic
+    private Integer valid;
+
+    /**
+     * 添加时间，入库时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater_id")
+    private Integer updaterId;
+
+    /**
+     * 修改时间，更具修改时间来判断下次执行顺序，第一次修改时间和新增时间相同
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 版本号 默认为 1
+     */
+    @TableField("version")
+    @Version
+    private String version;
+
+    /**
+     * 类型，0：wms To wcs日志，1：wcs to wms日志	2：wms to apms日志  3：apms to wms日志
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 内部编码，系统自动生成
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 日志名称
+     */
+    @TableField("log_name")
+    private String logName;
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+
+    public static final String ID = "id";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String TYPE = "type";
+
+    public static final String CODE = "code";
+
+    public static final String LOG_NAME = "log_name";
+
+    public static final String CONTENT = "content";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
@@ -1,21 +1,25 @@
 package com.mt.wms.core.dal.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
 * <p>
 * 当前任务
 * </p>
 *
 * @author mt
- * @since 2021-11-16
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Factory.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Factory.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfoHis.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfoHis.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/KilnInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/KilnInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Location.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Location.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/LoginLog.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/LoginLog.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/LoginSession.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/LoginSession.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-11-08
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java
@@ -1,21 +1,25 @@
 package com.mt.wms.core.dal.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
 * <p>
 * 订单任务历史表
 * </p>
 *
 * @author mt
- * @since 2021-11-16
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParBase.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParBase.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParEleValue.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParEleValue.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParGasValue.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParGasValue.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParRotSpeedValue.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParRotSpeedValue.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParTemValue.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParTemValue.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ProductAttr.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ProductAttr.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ProductLibrary.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ProductLibrary.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Resource.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Resource.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsCode.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsCode.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsScene.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsScene.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsSend.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsSend.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsSign.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsSign.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsTemplate.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SmsTemplate.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysDictData.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysDictData.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysDictType.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysDictType.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysFile.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysFile.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysFileType.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysFileType.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysMenu.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysMenu.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysMenuResource.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysMenuResource.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysOrg.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysOrg.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysPost.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysPost.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysRole.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysRole.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysRoleMenu.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysRoleMenu.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUser.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUser.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUserPost.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUserPost.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUserRole.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/SysUserRole.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java
@@ -1,21 +1,25 @@
 package com.mt.wms.core.dal.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
 * <p>
 * 任务明细历史表
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java
@@ -1,21 +1,25 @@
 package com.mt.wms.core.dal.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
 * <p>
 * 任务历史
 * </p>
 *
 * @author mt
- * @since 2021-11-16
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskSourceLog.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskSourceLog.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TrayInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TrayInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/VehicleInfo.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/VehicleInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Warehouse.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/Warehouse.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WcsTask.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WcsTask.java
@@ -0,0 +1,149 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * wcs 任务信息表
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_wcs_task")
+public class WcsTask extends Model<WcsTask> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用，2停止
+     */
+    @TableField("valid")
+    @TableLogic
+    private Integer valid;
+
+    /**
+     * 添加时间，入库时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater_id")
+    private Integer updaterId;
+
+    /**
+     * 修改时间，更具修改时间来判断下次执行顺序，第一次修改时间和新增时间相同
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 版本号 默认为 1
+     */
+    @TableField("version")
+    @Version
+    private String version;
+
+    /**
+     * 任务编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 标识卡号
+     */
+    @TableField("iden_card_number")
+    private String idenCardNumber;
+
+    /**
+     * 产品名称，有多个逗号隔开
+     */
+    @TableField("product_name")
+    private String productName;
+
+    /**
+     * 材料牌号，有多个逗号隔开
+     */
+    @TableField("material_grade")
+    private String materialGrade;
+
+    /**
+     * 开始位置
+     */
+    @TableField("start_position")
+    private String startPosition;
+
+    /**
+     * 结束位置
+     */
+    @TableField("end_position")
+    private String endPosition;
+
+    /**
+     * 状态，0：未执行，1：正在执行，2：执行成功，3：执行失败
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    public static final String ID = "id";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String CODE = "code";
+
+    public static final String IDEN_CARD_NUMBER = "iden_card_number";
+
+    public static final String PRODUCT_NAME = "product_name";
+
+    public static final String MATERIAL_GRADE = "material_grade";
+
+    public static final String START_POSITION = "start_position";
+
+    public static final String END_POSITION = "end_position";
+
+    public static final String STATUS = "status";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WcsTaskLog.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WcsTaskLog.java
@@ -0,0 +1,133 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * wcs 任务信息日志表
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_wcs_task_log")
+public class WcsTaskLog extends Model<WcsTaskLog> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用，2停止
+     */
+    @TableField("valid")
+    @TableLogic
+    private Integer valid;
+
+    /**
+     * 添加时间，入库时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater_id")
+    private Integer updaterId;
+
+    /**
+     * 修改时间，更具修改时间来判断下次执行顺序，第一次修改时间和新增时间相同
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 版本号 默认为 1
+     */
+    @TableField("version")
+    @Version
+    private String version;
+
+    /**
+     * 任务来源
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 接收状态
+     */
+    @TableField("receive_status")
+    private String receiveStatus;
+
+    /**
+     * 发送状态
+     */
+    @TableField("send_status")
+    private String sendStatus;
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 编码 和 t_wcs_task 中的code 一直。用来对应wms传过来任务的 唯一标识
+     */
+    @TableField("code")
+    private String code;
+
+
+    public static final String ID = "id";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String SOURCE = "source";
+
+    public static final String RECEIVE_STATUS = "receive_status";
+
+    public static final String SEND_STATUS = "send_status";
+
+    public static final String CONTENT = "content";
+
+    public static final String CODE = "code";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WechatTemplateMessage.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/WechatTemplateMessage.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
@Data
@EqualsAndHashCode(callSuper = false)
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmBaseMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmBaseMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface AlarmBaseMapper extends BaseMapper<AlarmBase> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmInfoMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmInfoMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface AlarmInfoMapper extends BaseMapper<AlarmInfo> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CommunicationLogMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CommunicationLogMapper.java
@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.CommunicationLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 通讯日志信息 包括wcs与wms  apms与wms相互通讯 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-18
+ */
+public interface CommunicationLogMapper extends BaseMapper<CommunicationLog> {
+
+}
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CommunicationLogMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CommunicationLogMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mt.wms.core.dal.mapper.CommunicationLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.CommunicationLog">
+        <id column="id" property="id" />
+        <result column="valid" property="valid" />
+        <result column="create_time" property="createTime" />
+        <result column="creator_id" property="creatorId" />
+        <result column="updater_id" property="updaterId" />
+        <result column="update_time" property="updateTime" />
+        <result column="version" property="version" />
+        <result column="type" property="type" />
+        <result column="code" property="code" />
+        <result column="log_name" property="logName" />
+        <result column="content" property="content" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, creator_id, updater_id, update_time, version, type, code, log_name, content
+    </sql>
+
+</mapper>
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskDetMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskDetMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface CurrTaskDetMapper extends BaseMapper<CurrTaskDet> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-11-09
+ * @since 2021-11-18
 */
 public interface CurrTaskMapper extends BaseMapper<CurrTask> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
@@ -16,7 +16,7 @@
        <result column="task_code" property="taskCode" />
        <result column="task_source" property="taskSource" />
        <result column="task_type" property="taskType" />
-        <result column="process_type" property="processType"/>
+        <result column="process_type" property="processType" />
        <result column="pallet_code" property="palletCode" />
        <result column="a_begin_time" property="aBeginTime" />
        <result column="a_end_time" property="aEndTime" />
@@ -32,9 +32,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code,
-        task_source, task_type, process_type, pallet_code, a_begin_time, a_end_time, start_position, target_position,
-        kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_source, task_type, process_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name
    </sql>

 </mapper>
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/FactoryMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/FactoryMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface FactoryMapper extends BaseMapper<Factory> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface InStockInfoHisMapper extends BaseMapper<InStockInfoHis> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface InStockInfoMapper extends BaseMapper<InStockInfo> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/KilnInfoMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/KilnInfoMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface KilnInfoMapper extends BaseMapper<KilnInfo> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LocationMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LocationMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface LocationMapper extends BaseMapper<Location> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LoginLogMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LoginLogMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface LoginLogMapper extends BaseMapper<LoginLog> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LoginSessionMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/LoginSessionMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface LoginSessionMapper extends BaseMapper<LoginSession> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;

 /**
 * <p>
- * 订单历史信息 Mapper 接口
+ * 订单任务历史表 Mapper 接口
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface OrderInfoHisMapper extends BaseMapper<OrderInfoHis> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml
@@ -11,7 +11,7 @@
        <result column="updater_id" property="updaterId" />
        <result column="update_time" property="updateTime" />
        <result column="version" property="version" />
-        <result column="order_source" property="orderSource"/>
+        <result column="order_source" property="orderSource" />
        <result column="status" property="status" />
        <result column="inter_code" property="interCode" />
        <result column="code" property="code" />
@@ -30,9 +30,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
-        order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit,
-        weight, quantity
+        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code, order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit, weight, quantity
    </sql>

 </mapper>
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-11-08
+ * @since 2021-11-18
 */
 public interface OrderInfoMapper extends BaseMapper<OrderInfo> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParBaseMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParBaseMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParBaseMapper extends BaseMapper<ParBase> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParEleValueMapper extends BaseMapper<ParEleValue> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParGasValueMapper extends BaseMapper<ParGasValue> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParInfoMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParInfoMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParInfoMapper extends BaseMapper<ParInfo> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParRotSpeedValueMapper extends BaseMapper<ParRotSpeedValue> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ParTemValueMapper extends BaseMapper<ParTemValue> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ProductAttrMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ProductAttrMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ProductAttrMapper extends BaseMapper<ProductAttr> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ProductLibraryMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ProductLibraryMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ProductLibraryMapper extends BaseMapper<ProductLibrary> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ResourceMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ResourceMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface ResourceMapper extends BaseMapper<Resource> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsCodeMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsCodeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SmsCodeMapper extends BaseMapper<SmsCode> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSceneMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSceneMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SmsSceneMapper extends BaseMapper<SmsScene> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSendMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSendMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SmsSendMapper extends BaseMapper<SmsSend> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSignMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsSignMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SmsSignMapper extends BaseMapper<SmsSign> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsTemplateMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SmsTemplateMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SmsTemplateMapper extends BaseMapper<SmsTemplate> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysDictDataMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysDictDataMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysDictDataMapper extends BaseMapper<SysDictData> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysDictTypeMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysDictTypeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysDictTypeMapper extends BaseMapper<SysDictType> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysFileMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysFileMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysFileMapper extends BaseMapper<SysFile> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysFileTypeMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysFileTypeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysFileTypeMapper extends BaseMapper<SysFileType> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysMenuMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysMenuMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysMenuMapper extends BaseMapper<SysMenu> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysMenuResourceMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysMenuResourceMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysMenuResourceMapper extends BaseMapper<SysMenuResource> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysOrgMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysOrgMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysOrgMapper extends BaseMapper<SysOrg> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysPostMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysPostMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysPostMapper extends BaseMapper<SysPost> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysRoleMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysRoleMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysRoleMapper extends BaseMapper<SysRole> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysRoleMenuMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysRoleMenuMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysUserMapper extends BaseMapper<SysUser> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserPostMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserPostMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysUserPostMapper extends BaseMapper<SysUserPost> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserRoleMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/SysUserRoleMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {

--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * </p>
 *
 * @author mt
- * @since 2021-09-29
+ * @since 2021-11-18
 */
 public interface TaskDetHisMapper extends BaseMapper<TaskDetHis> {

--- a/Show More
+++ b/Show More