update:

2号油搅拌速度；
1，2外区温度；

6.program/pom.xml

@@ -24,7 +24,7 @@
     <packaging>pom</packaging>
     <version>1.0</version>
 
-    <name>wms</name>
+    <name>wms-qj</name>
     <description>wms</description>
     <url>https://wms.picaiba.com</url>
 
@@ -45,16 +45,19 @@
                 <spring.rabbitmq.username>guest</spring.rabbitmq.username>
                 <spring.rabbitmq.password>guest</spring.rabbitmq.password>
                 <!-- redis -->
-                <spring.redis.cluster.nodes>redis.picaiba.com:6380</spring.redis.cluster.nodes>
+<!--                <spring.redis.cluster.nodes>redis.picaiba.com:6380</spring.redis.cluster.nodes>
                 <spring.redis.host>redis.picaiba.com</spring.redis.host>
                 <spring.redis.port>6380</spring.redis.port>
                 <spring.redis.password><![CDATA["@WSXcde3"]]></spring.redis.password>
-                <spring.redis.database>5</spring.redis.database>
+                <spring.redis.database>5</spring.redis.database>-->
                 <!-- database -->
-                <spring.datasource.url>jdbc:p6spy:mysql://mysql.picaiba.com:30307/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false
-                </spring.datasource.url>
+                <!--<spring.datasource.url>jdbc:p6spy:mysql://localhost:30306/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false-->
+
+                <spring.datasource.url>jdbc:p6spy:mysql://localhost:30306/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false
+                 </spring.datasource.url>
                 <spring.datasource.username>root</spring.datasource.username>
-                <spring.datasource.password>1qaz@WSX3edc$RFV</spring.datasource.password>
+                <spring.datasource.password>ABC.10086</spring.datasource.password>
+               <!-- <spring.datasource.password>1qaz@WSX3edc$RFV</spring.datasource.password>-->
                 <!-- email -->
                 <spring.mail.host>smtp.mxhichina.com</spring.mail.host>
                 <!-- #25 ssl 465 -->
@@ -422,6 +425,14 @@
                         <skip>true</skip>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <configuration>
+                        <delimiters>@</delimiters>
+                        <useDefaultDelimiters>false</useDefaultDelimiters>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/AlarmBaseController.java

@@ -79,7 +79,7 @@ public class AlarmBaseController extends BaseController {
 
     @PostMapping(value = "codeGenerator")
     @ApiOperation(value = "编码生成")
-    private String CodeGenerator(){
-        return IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE");
+    private R<String> codeGenerator() {
+        return successful(IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE"));
     }
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/CraftInfoController.java

@@ -0,0 +1,89 @@
+package com.mt.wms.basic.controller;
+
+import com.mt.wms.basic.params.AlarmBaseParam;
+import com.mt.wms.basic.params.AlarmBaseQueryParam;
+import com.mt.wms.basic.params.CraftInfoParam;
+import com.mt.wms.basic.params.CraftInfoQueryParam;
+import com.mt.wms.basic.service.AlarmBaseService;
+import com.mt.wms.basic.service.CraftInfoService;
+import com.mt.wms.basic.vo.AlarmBaseVo;
+import com.mt.wms.basic.vo.CraftInfoVo;
+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.utils.IDGenerator;
+import com.mt.wms.core.validator.groups.AddGroup;
+import com.mt.wms.core.validator.groups.PageGroup;
+import com.mt.wms.core.validator.groups.UpdateGroup;
+import com.mt.wms.core.vo.IdVo;
+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/10/9 11:09
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping(CommonConstant.API_MODULE_BASE + "craftInfo")
+@Slf4j
+@Api(value = "工艺基础信息管理", tags = "工艺基础信息管理", hidden = false)
+public class CraftInfoController extends BaseController {
+
+    @Autowired
+    private CraftInfoService craftInfoService;
+
+    @PostMapping(value = "get")
+    @ApiOperation(value = "获取报警基础信息")
+    private R<CraftInfoVo> get(@Validated @RequestBody IdParam idParam) {
+        return craftInfoService.get(idParam);
+    }
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取报警基础信息列表")
+    private R<List<CraftInfoVo>> list(@Validated({Default.class}) @RequestBody CraftInfoQueryParam craftInfoQueryParam) {
+        return craftInfoService.list(craftInfoQueryParam);
+    }
+
+    @PostMapping(value = "page")
+    @ApiOperation(value = "获取分页报警基础信息")
+    private R<PageVo<CraftInfoVo>> page(@Validated({PageGroup.class, Default.class}) @RequestBody CraftInfoQueryParam craftInfoQueryParam) {
+        return craftInfoService.page(craftInfoQueryParam);
+    }
+
+    @PostMapping(value = "add")
+    @ApiOperation(value = "新增")
+    private R<IdVo> add(@Validated({AddGroup.class, Default.class}) @RequestBody CraftInfoParam craftInfoParam) {
+        return craftInfoService.add(craftInfoParam);
+    }
+
+    @PostMapping(value = "update")
+    @ApiOperation(value = "更新")
+    private R<IdVo> update(@Validated({UpdateGroup.class, Default.class}) @RequestBody CraftInfoParam craftInfoParam) {
+        return craftInfoService.update(craftInfoParam);
+    }
+
+    @PostMapping(value = "delete")
+    @ApiOperation(value = "删除报警基础信息")
+    private R<IdVo> delete(@Validated @RequestBody IdParam idParam) {
+        return craftInfoService.delete(idParam);
+    }
+
+    @PostMapping(value = "codeGenerator")
+    @ApiOperation(value = "编码生成")
+    private R<String> codeGenerator() {
+        return successful(IDGenerator.gen("GY", "yyyyMMddHHmm", 2, "CRAFTINFO_CODE"));
+    }
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/KilnInfoController.java

@@ -36,26 +36,26 @@ import java.util.List;
 @RestController
 @RequestMapping(CommonConstant.API_MODULE_BASE + "kilnInfo")
 @Slf4j
-@Api(value = "窑炉基础信息管理", tags = "窑炉基础信息管理", hidden = false)
+@Api(value = "工业炉基础信息管理", tags = "工业炉基础信息管理", hidden = false)
 public class KilnInfoController extends BaseController {
 
     @Autowired
     private KilnInfoService kilnInfoService;
 
     @PostMapping(value = "get")
-    @ApiOperation(value = "获取窑炉信息")
+    @ApiOperation(value = "获取工业炉信息")
     private R<KilnInfoVo> get(@Validated @RequestBody IdParam idParam) {
         return kilnInfoService.get(idParam);
     }
 
     @PostMapping(value = "list")
-    @ApiOperation(value = "获取窑炉列表")
+    @ApiOperation(value = "获取工业炉列表")
     private R<List<KilnInfoVo>> list(@Validated({Default.class}) @RequestBody KilnInfoQueryParam kilnInfoQueryParam) {
         return kilnInfoService.list(kilnInfoQueryParam);
     }
 
     @PostMapping(value = "page")
-    @ApiOperation(value = "获取分页窑炉")
+    @ApiOperation(value = "获取分页工业炉")
     private R<PageVo<KilnInfoVo>> page(@Validated({PageGroup.class, Default.class}) @RequestBody KilnInfoQueryParam kilnInfoQueryParam) {
         return kilnInfoService.page(kilnInfoQueryParam);
     }
@@ -80,7 +80,7 @@ public class KilnInfoController extends BaseController {
 
     @PostMapping(value = "codeGenerator")
     @ApiOperation(value = "编码生成")
-    private String CodeGenerator(){
-        return IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE");
+    private R<String> codeGenerator(){
+        return successful(IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE"));
     }
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/LocationInfoController.java

@@ -78,8 +78,8 @@ public class LocationInfoController extends BaseController {
 
     @PostMapping(value = "codeGenerator")
     @ApiOperation(value = "编码生成")
-    private String CodeGenerator(){
-        return IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE");
+    private R<String> codeGenerator(){
+        return successful(IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE"));
     }
 
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/VehicleController.java

@@ -1,11 +1,14 @@
 package com.mt.wms.basic.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mt.wms.basic.params.VehicleParam;
 import com.mt.wms.basic.params.VehicleQueryParam;
 import com.mt.wms.basic.service.VehicleService;
 import com.mt.wms.basic.vo.VehicleVo;
 import com.mt.wms.core.base.BaseController;
 import com.mt.wms.core.constants.CommonConstant;
+import com.mt.wms.core.dal.entity.VehicleInfo;
+import com.mt.wms.core.dal.service.VehicleInfoServiceBiz;
 import com.mt.wms.core.params.IdParam;
 import com.mt.wms.core.utils.IDGenerator;
 import com.mt.wms.core.validator.groups.AddGroup;
@@ -40,6 +43,8 @@ public class VehicleController extends BaseController {
 
     @Autowired
     private VehicleService vehicleService;
+    @Autowired
+    private VehicleInfoServiceBiz vehicleInfoServiceBiz;
     @PostMapping(value = "get")
     @ApiOperation(value = "获取车辆信息")
     private R<VehicleVo> get(@Validated @RequestBody IdParam idParam) {
@@ -78,8 +83,19 @@ public class VehicleController extends BaseController {
 
     @PostMapping(value = "codeGenerator")
     @ApiOperation(value = "编码生成")
-    private String CodeGenerator(){
-        return IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE");
+    private R<String> codeGenerator(){
+        return successful(IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE"));
     }
 
+    @PostMapping(value = "resetStatus")
+    @ApiOperation(value = "重置车辆状态")
+    private R<String> reset(){
+        List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS, 1));
+        for (VehicleInfo vehicleInfo:vehicleInfoList
+             ) {
+            vehicleInfo.setStatus(0);
+            vehicleInfoServiceBiz.updateById(vehicleInfo);
+        }
+        return successful("操作成功，车辆状态已重置为空闲！");
+    }
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/controller/WarehouseController.java

@@ -80,7 +80,7 @@ public class WarehouseController extends BaseController {
 
     @PostMapping(value = "codeGenerator")
     @ApiOperation(value = "编码生成")
-    private String CodeGenerator(){
-        return IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE");
+    private R<String> codeGenerator(){
+        return successful(IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE"));
     }
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/params/CraftInfoParam.java

@@ -0,0 +1,53 @@
+package com.mt.wms.basic.params;
+
+import com.mt.wms.core.base.BaseParam;
+import com.mt.wms.core.validator.groups.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2022/1/25 21:34
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "工艺基础信息参数对象", description = "用于新增和更新工艺基础信息")
+public class CraftInfoParam  extends BaseParam {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键，自增
+     */
+    @ApiModelProperty(value = "主键",required = false, example = "1")
+    @NotNull(message = "xxID不能为空", groups = {UpdateGroup.class})
+    private Long id;
+
+    /**
+     * 编码
+     */
+    @ApiModelProperty(value = "编码", example = "1")
+    private String  code;
+    /**
+     * 工艺号
+     */
+    @ApiModelProperty(value = "工艺号", example = "1")
+    @NotNull(message = "工艺号不能为空")
+    private String  craftCode;
+    /**
+     * plc值
+     */
+    @ApiModelProperty(value = "plc值", example = "1")
+    @NotNull(message = "plc值不能为空")
+    private Integer plcValue;
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value = "说明", example = "1")
+    private String  content;
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/params/CraftInfoQueryParam.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: 2022/1/25 21:37
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "报警基础信息查询参数", description = "用于查询报警基础信息")
+public class CraftInfoQueryParam  extends BasePageParam {
+    /**
+     * 主键，自增
+     */
+    @ApiModelProperty(value = "主键",required = false, example = "1")
+    private Long id;
+
+    /**
+     * 工艺号
+     */
+    @ApiModelProperty(value = "工艺号",required = false, example = "1")
+    private String craftCode;
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoParam.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "窑炉参数对象", description = "用于新增和更新窑炉信息")
+@ApiModel(value = "工业炉参数对象", description = "用于新增和更新工业炉信息")
 public class KilnInfoParam extends BaseParam {
 
     private static final long serialVersionUID = 1L;
@@ -49,6 +49,12 @@ public class KilnInfoParam extends BaseParam {
     @ApiModelProperty(value = "缩写(别名)",  example = "1")
     @NotNull(message = "别名不能为空")
     private String kilnAlias;
+    /**
+     * 设备类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉
+     */
+    @ApiModelProperty(value = "设备类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉",  example = "1")
+    @NotNull(message = "设备类型不能为空")
+    private Integer type;
 
 
     /**
@@ -67,7 +73,7 @@ public class KilnInfoParam extends BaseParam {
      * 端口号
      */
     @ApiModelProperty(value = "端口号",  example = "8888")
-    private String partNumber;
+    private String portNumber;
 
     /**
      * 备注

6.program/wms-basic/src/main/java/com/mt/wms/basic/params/KilnInfoQueryParam.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "窑炉查询参数", description = "用于查询窑炉信息")
+@ApiModel(value = "工业炉查询参数", description = "用于查询工业炉信息")
 public class KilnInfoQueryParam extends BasePageParam {
     /**
      * 主键，自增

6.program/wms-basic/src/main/java/com/mt/wms/basic/params/WarehouseParam.java

@@ -61,4 +61,28 @@ public class WarehouseParam extends BaseParam {
      */
     @ApiModelProperty(value = "描述",required = true, example = "1")
     private String description;
+
+    /**
+     * 英文名称
+     */
+    @ApiModelProperty(value = "英文名称",required = false, example = "1")
+    private String englishName;
+
+    /**
+     * 别名
+     */
+    @ApiModelProperty(value = "英文名称",required = false, example = "1")
+    private String aliasName;
+
+    /**
+     * 库位数量
+     */
+    @ApiModelProperty(value = "英文名称",required = true, example = "1")
+    private Integer number;
+
+    /**
+     * 状态		0初始化，1已占用
+     */
+    @ApiModelProperty(value = "状态",required = true, example = "1")
+    private Integer status;
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/service/CraftInfoService.java

@@ -0,0 +1,73 @@
+package com.mt.wms.basic.service;
+
+import com.mt.wms.basic.params.AlarmBaseParam;
+import com.mt.wms.basic.params.AlarmBaseQueryParam;
+import com.mt.wms.basic.params.CraftInfoParam;
+import com.mt.wms.basic.params.CraftInfoQueryParam;
+import com.mt.wms.basic.vo.AlarmBaseVo;
+import com.mt.wms.basic.vo.CraftInfoVo;
+import com.mt.wms.core.dal.entity.CraftInfo;
+import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.vo.IdVo;
+import com.mt.wms.core.vo.PageVo;
+import com.mt.wms.core.vo.R;
+
+import java.util.List;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/10/9 10:46
+ * @Version 1.0
+ */
+public interface CraftInfoService {
+
+    /**
+     * 获取xx
+     *
+     * @param idParam 主键参数
+     * @return xx
+     */
+    R<CraftInfoVo> get(IdParam idParam);
+
+    /**
+     * 获取xx列表
+     *
+     * @param craftInfoQueryParam xx查询参数
+     * @return xx列表
+     */
+    R<List<CraftInfoVo>> list(CraftInfoQueryParam craftInfoQueryParam);
+
+    /**
+     * 获取xx分页列表
+     *
+     * @param craftInfoQueryParam xx查询参数
+     * @return xx分页列表
+     */
+    R<PageVo<CraftInfoVo>> page(CraftInfoQueryParam craftInfoQueryParam);
+
+
+    /**
+     * 新增xx
+     *
+     * @param craftInfoParam xx参数
+     * @return 主键
+     */
+    R<IdVo> add(CraftInfoParam craftInfoParam);
+
+    /**
+     * 更新xx
+     *
+     * @param craftInfoParam xx参数
+     * @return 主键
+     */
+    R<IdVo> update(CraftInfoParam craftInfoParam);
+
+
+    /**
+     * 删除xx
+     *
+     * @param idParam 主键参数
+     * @return 主键
+     */
+    R<IdVo> delete(IdParam idParam);
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/service/impl/CraftInfoServiceImpl.java

@@ -0,0 +1,97 @@
+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.AlarmBaseParam;
+import com.mt.wms.basic.params.AlarmBaseQueryParam;
+import com.mt.wms.basic.params.CraftInfoParam;
+import com.mt.wms.basic.params.CraftInfoQueryParam;
+import com.mt.wms.basic.service.AlarmBaseService;
+import com.mt.wms.basic.service.CraftInfoService;
+import com.mt.wms.basic.vo.AlarmBaseVo;
+import com.mt.wms.basic.vo.CraftInfoVo;
+import com.mt.wms.core.api.Assert;
+import com.mt.wms.core.base.BaseService;
+import com.mt.wms.core.dal.entity.AlarmBase;
+import com.mt.wms.core.dal.entity.CraftInfo;
+import com.mt.wms.core.dal.service.AlarmBaseServiceBiz;
+import com.mt.wms.core.dal.service.CraftInfoServiceBiz;
+import com.mt.wms.core.errorcode.ApiErrorCode;
+import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.vo.IdVo;
+import com.mt.wms.core.vo.PageVo;
+import com.mt.wms.core.vo.R;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2021/10/9 10:49
+ * @Version 1.0
+ */
+@Service
+@Transactional
+public class CraftInfoServiceImpl extends BaseService implements CraftInfoService {
+
+    @Resource
+    private CraftInfoServiceBiz craftInfoServiceBiz;
+
+    @Override
+    public R<CraftInfoVo> get(IdParam idParam) {
+        Assert.notNull(ApiErrorCode.INVALID_PARAMETER,idParam.getId());
+        CraftInfo craftInfo = craftInfoServiceBiz.getById(idParam.getId());
+        CraftInfoVo craftInfoVo = CraftInfoVo.builder().build();
+        BeanUtils.copyProperties(craftInfo,craftInfoVo);
+        return successful(craftInfoVo);
+    }
+
+    @Override
+    public R<List<CraftInfoVo>> list(CraftInfoQueryParam craftInfoQueryParam) {
+        QueryWrapper<CraftInfo> wrapper=new QueryWrapper<>();
+        wrapper.eq(CraftInfo.VALID,1);
+        List<CraftInfo> craftInfoList = craftInfoServiceBiz.list(wrapper);
+        List<CraftInfoVo> craftInfoVoList = com.mt.wms.core.utils.BeanUtils.copyList(craftInfoList, CraftInfoVo.class);
+        return successful(craftInfoVoList);
+    }
+
+    @Override
+    public R<PageVo<CraftInfoVo>> page(CraftInfoQueryParam craftInfoQueryParam) {
+        QueryWrapper<CraftInfo> wrapper=new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(craftInfoQueryParam.getCraftCode()),CraftInfo.CRAFT_CODE,craftInfoQueryParam.getCraftCode())
+                .orderByAsc(CraftInfo.CREATE_TIME);
+        Page<CraftInfo> page = craftInfoServiceBiz.page(new Page<>(craftInfoQueryParam.getCurrent(), craftInfoQueryParam.getSize()), wrapper);
+        return successful(new PageVo<>(page,CraftInfoVo.class));
+    }
+
+    @Override
+    public R<IdVo> add(CraftInfoParam craftInfoParam) {
+        QueryWrapper<CraftInfo> wrapper=new QueryWrapper<>();
+
+        CraftInfo craftInfo=new CraftInfo();
+        BeanUtils.copyProperties(craftInfoParam,craftInfo);
+        setCommonField(craftInfo);
+        craftInfoServiceBiz.save(craftInfo);
+        return successful(IdVo.builder().id(craftInfo.getId()).build());
+    }
+
+    @Override
+    public R<IdVo> update(CraftInfoParam craftInfoParam) {
+        CraftInfo craftInfo = craftInfoServiceBiz.getById(craftInfoParam.getId());
+        CraftInfo updateCraftInfo=new CraftInfo();
+        BeanUtils.copyProperties(craftInfoParam,updateCraftInfo);
+        setUpdateCommonField(updateCraftInfo);
+        craftInfoServiceBiz.updateById(updateCraftInfo);
+        return successful(IdVo.builder().id(updateCraftInfo.getId()).build());
+    }
+
+    @Override
+    public R<IdVo> delete(IdParam idParam) {
+        craftInfoServiceBiz.removeById(idParam.getId());
+        return successful(IdVo.builder().id(idParam.getId()).build());
+    }
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/CraftInfoVo.java

@@ -0,0 +1,55 @@
+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;
+
+/**
+ * @Author: liguanghao
+ * @Date: 2022/1/25 21:27
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@Builder
+@ApiModel(value = "工艺信息视图对象", description = "用于查询工艺信息信息")
+public class CraftInfoVo 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  craftCode;
+    /**
+     * plc值
+     */
+    @ApiModelProperty(value = "plc值", example = "1")
+    private Integer plcValue;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态", example = "1")
+    private Integer  status;
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value = "说明", example = "1")
+    private String  content;
+}

6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/KilnInfoVo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Builder
-@ApiModel(value = "窑炉视图对象", description = "用于查询窑炉信息")
+@ApiModel(value = "工业炉视图对象", description = "用于查询工业炉信息")
 public class KilnInfoVo  extends BaseVo implements PageVo.ConvertVo {
     /**
      * 主键，自增
@@ -32,6 +32,12 @@ public class KilnInfoVo  extends BaseVo implements PageVo.ConvertVo {
     @ApiModelProperty(value = "编码",  example = "1")
     private String code;
 
+    /**
+     * 类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉
+     */
+    @ApiModelProperty(value = "类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉",  example = "1")
+    private Integer type;
+
     /**
      * 名称
      */
@@ -61,7 +67,7 @@ public class KilnInfoVo  extends BaseVo implements PageVo.ConvertVo {
      * 端口号
      */
     @ApiModelProperty(value = "端口号",  example = "8888")
-    private String partNumber;
+    private String portNumber;
 
     /**
      * 状态	0初始化，1损坏

6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/LocationInfoVo.java

@@ -48,7 +48,7 @@ public class LocationInfoVo extends BaseVo implements PageVo.ConvertVo {
      * 状态
      */
     @ApiModelProperty(value = "状态:0空闲，1使用，2不可用",  example = "1")
-    private String status;
+    private Integer status;
 
     /**
      * 缓存区

6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/VehicleVo.java

@@ -60,4 +60,10 @@ public class VehicleVo extends BaseVo implements PageVo.ConvertVo{
      */
     @ApiModelProperty(value = "描述信息",  example = "1")
     private String description;
+
+    /**
+     * 描述信息
+     */
+    @ApiModelProperty(value = "车辆状态：0-空闲，1-占用",  example = "1")
+    private Integer status;
 }

6.program/wms-basic/src/main/java/com/mt/wms/basic/vo/WarehouseVo.java

@@ -57,4 +57,27 @@ public class WarehouseVo extends BaseVo implements PageVo.ConvertVo{
      */
     @ApiModelProperty(value = "描述信息",  example = "1")
     private String description;
+    /**
+     * 英文名称
+     */
+    @ApiModelProperty(value = "英文名称",example = "1")
+    private String englishName;
+
+    /**
+     * 别名
+     */
+    @ApiModelProperty(value = "别名",example = "1")
+    private String aliasName;
+
+    /**
+     * 库位数量
+     */
+    @ApiModelProperty(value = "库位数量",example = "1")
+    private Integer number;
+
+    /**
+     * 状态		0初始化，1已占用
+     */
+    @ApiModelProperty(value = "状态", example = "1")
+    private Integer status;
 }

6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java

@@ -21,9 +21,9 @@ public class MyGenerator {
     /**
      * 数据库地址
      */
-    static String dbUrl = "jdbc:mysql://mysql.picaiba.com:30307/mt_wms_qj";
+    static String dbUrl = "jdbc:mysql://localhost:3306/mt_wms_qj";
     static String userName = "root";
-    static String password = "1qaz@WSX3edc$RFV";
+    static String password = "123456";
     /**
      * 是否去掉生成实体的属性名前缀
      */
@@ -106,7 +106,7 @@ public class MyGenerator {
 
     @Test
     public void generateCodeWithInjectConfigForAllTable() {
-        generateByTablesWithInjectConfig(new String[]{"t_in_stock_info"});
+        generateByTablesWithInjectConfig(new String[]{"t_question_answer"});
     }
 
     public static void main(String[] args) {

6.program/wms-core/src/main/java/com/mt/wms/core/base/BaseSupport.java

@@ -100,6 +100,19 @@ public abstract class BaseSupport {
     protected <T> R<T> successful(String msg, T data) {
         return R.ok(msg, data);
     }
+    /**
+     * <p>
+     * 请求成功
+     * </p>
+     * @param code 正确码
+     * @param msg  提示内容
+     * @param data 数据内容
+     * @param <T>  对象泛型
+     * @return
+     */
+    protected <T> R<T> successful(int code,String msg, T data) {
+        return R.ok(code,msg, data);
+    }
 
     /**
      * <p>

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-11-18
+ * @since 2022-02-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -92,7 +92,7 @@ public class AlarmInfo extends Model<AlarmInfo> {
      * 设备id
      */
     @TableField("equipment_id")
-    private Integer equipmentId;
+    private Long equipmentId;
 
     /**
      * 设备名称
@@ -101,7 +101,7 @@ public class AlarmInfo extends Model<AlarmInfo> {
     private String equipmentName;
 
     /**
-     * 报警类型		0窑炉，1表示车辆，依次类推
+     * 报警类型		0工业炉，1表示车辆，依次类推
      */
     @TableField("type")
     private Integer type;
@@ -130,6 +130,12 @@ public class AlarmInfo extends Model<AlarmInfo> {
     @TableField("note")
     private String note;
 
+    /**
+     * 加工任务编码（炉子报警时记录）
+     */
+    @TableField("task_code")
+    private String taskCode;
+
 
     public static final String ID = "id";
 
@@ -165,6 +171,8 @@ public class AlarmInfo extends Model<AlarmInfo> {
 
     public static final String NOTE = "note";
 
+    public static final String TASK_CODE = "task_code";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2022-01-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -79,7 +79,7 @@ public class ApmsCheckResult extends Model<ApmsCheckResult> {
     private String idenCardNum;
 
     /**
-     * 硬度检验结果（合格、不合格、返工、作废）
+     * 硬度检验结果（待检验、合格、不合格、返工、作废）
      */
     @TableField("hardness")
     private String hardness;
@@ -94,7 +94,115 @@ public class ApmsCheckResult extends Model<ApmsCheckResult> {
      * 心部硬度检验值
      */
     @TableField("heart_hardness")
-    private Float heartHardness;
+    private String heartHardness;
+
+    /**
+     * 备注，特殊注释等
+     */
+    @TableField("remake")
+    private String remake;
+
+    /**
+     * 硬度检验结果1
+     */
+    @TableField("hardness_value_one")
+    private String hardnessValueOne;
+
+    /**
+     * 硬度检验结果2
+     */
+    @TableField("hardness_value_two")
+    private String hardnessValueTwo;
+
+    /**
+     * 硬度检验结果3
+     */
+    @TableField("hardness_value_three")
+    private String hardnessValueThree;
+
+    /**
+     * 金相检验渗碳淬火 渗碳层深度
+     */
+    @TableField("metallography_stch_stccsd")
+    private Float metallographyStchStccsd;
+
+    /**
+     * 金相检验渗碳淬火 表面为马氏体、残余奥氏体（级）
+     */
+    @TableField("metallography_stch_mstost")
+    private String metallographyStchMstost;
+
+    /**
+     * 金相检验渗碳淬火 细小颗粒状碳化物
+     */
+    @TableField("metallography_stch_xxklzthw")
+    private String metallographyStchXxklzthw;
+
+    /**
+     * 金相检验渗碳淬火 心部为低碳马氏体加游离铁素体（级）
+     */
+    @TableField("metallography_stch_dtmstyltst")
+    private String metallographyStchDtmstyltst;
+
+    /**
+     * 金相检验整体淬火 基体为回火马氏体（级）
+     */
+    @TableField("metallography_ztch_hhmst")
+    private String metallographyZtchHhmst;
+
+    /**
+     * 金相检验整体淬火 基体为回火托式体（级）
+     */
+    @TableField("metallography_ztch_hhtst")
+    private String metallographyZtchHhtst;
+
+    /**
+     * 金相检验整体淬火 基体为回火素式体（级）
+     */
+    @TableField("metallography_ztch_hhsst")
+    private String metallographyZtchHhsst;
+
+    /**
+     * 金相检验氮化 表面亮白色的为氮化合物层深
+     */
+    @TableField("metallography_dh_dhhwcs")
+    private Float metallographyDhDhhwcs;
+
+    /**
+     * 金相检验氮化 向内为扩散层深
+     */
+    @TableField("metallography_dh_kscs")
+    private Float metallographyDhKscs;
+
+    /**
+     * 金相检验氮化 心部
+     */
+    @TableField("metallography_dh_xb")
+    private String metallographyDhXb;
+
+    /**
+     * 金相检验表面淬火 表面为板条马氏体（级）
+     */
+    @TableField("metallography_bmch_btmst")
+    private String metallographyBmchBtmst;
+
+    /**
+     * 金相检验表面淬火 心部
+     */
+    @TableField("metallography_bmch_xb")
+    private String metallographyBmchXb;
+
+    /**
+     * 金相检验 备注
+     */
+    @TableField("metallography_bz")
+    private String metallographyBz;
+
+    /**
+     * 金相检验心部硬度 心部硬度检验结果
+     */
+    @TableField("metallography_xbyd_xbydjyjg")
+    private Float metallographyXbydXbydjyjg;
 
 
     public static final String ID = "id";
@@ -121,6 +229,42 @@ public class ApmsCheckResult extends Model<ApmsCheckResult> {
 
     public static final String HEART_HARDNESS = "heart_hardness";
 
+    public static final String REMAKE = "remake";
+
+    public static final String HARDNESS_VALUE_ONE = "hardness_value_one";
+
+    public static final String HARDNESS_VALUE_TWO = "hardness_value_two";
+
+    public static final String HARDNESS_VALUE_THREE = "hardness_value_three";
+
+    public static final String METALLOGRAPHY_STCH_STCCSD = "metallography_stch_stccsd";
+
+    public static final String METALLOGRAPHY_STCH_MSTOST = "metallography_stch_mstost";
+
+    public static final String METALLOGRAPHY_STCH_XXKLZTHW = "metallography_stch_xxklzthw";
+
+    public static final String METALLOGRAPHY_STCH_DTMSTYLTST = "metallography_stch_dtmstyltst";
+
+    public static final String METALLOGRAPHY_ZTCH_HHMST = "metallography_ztch_hhmst";
+
+    public static final String METALLOGRAPHY_ZTCH_HHTST = "metallography_ztch_hhtst";
+
+    public static final String METALLOGRAPHY_ZTCH_HHSST = "metallography_ztch_hhsst";
+
+    public static final String METALLOGRAPHY_DH_DHHWCS = "metallography_dh_dhhwcs";
+
+    public static final String METALLOGRAPHY_DH_KSCS = "metallography_dh_kscs";
+
+    public static final String METALLOGRAPHY_DH_XB = "metallography_dh_xb";
+
+    public static final String METALLOGRAPHY_BMCH_BTMST = "metallography_bmch_btmst";
+
+    public static final String METALLOGRAPHY_BMCH_XB = "metallography_bmch_xb";
+
+    public static final String METALLOGRAPHY_BZ = "metallography_bz";
+
+    public static final String METALLOGRAPHY_XBYD_XBYDJYJG = "metallography_xbyd_xbydjyjg";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AutoExeTask.java

@@ -0,0 +1,372 @@
+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>
+ * 自动执行任务表
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_auto_exe_task")
+public class AutoExeTask extends Model<AutoExeTask> {
+
+    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;
+
+    /**
+     * 状态，0：新增，1：执行中，2完成，3 终止
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 内部编码，系统自动生成
+     */
+    @TableField("inter_code")
+    private String interCode;
+
+    /**
+     * 工艺流程ID
+     */
+    @TableField("process_flow_id")
+    private Long processFlowId;
+
+    /**
+     * 工艺流程名称
+     */
+    @TableField("process_flow_name")
+    private String processFlowName;
+
+    /**
+     * 工艺类型，1表示第一种工艺流程，2表示第二种工艺流程
+     */
+    @TableField("process_flow_type")
+    private Integer processFlowType;
+
+    /**
+     * 工艺号ID
+     */
+    @TableField("craft_code_id")
+    private Long craftCodeId;
+
+    /**
+     * 工艺编码
+     */
+    @TableField("craft_code")
+    private String craftCode;
+
+    /**
+     * 区域ID，区分不同操作区域
+     */
+    @TableField("warehouse_id")
+    private Long warehouseId;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("f_task_id")
+    private Long fTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("f_det_task_code")
+    private String fDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("f_equipment_type_id")
+    private Long fEquipmentTypeId;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("f_equipment_id")
+    private Long fEquipmentId;
+
+    /**
+     * 设备名称（炉子名称）
+     */
+    @TableField("f_equipment_name")
+    private String fEquipmentName;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("f_craft_code_id")
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("f_in_tran_status")
+    private Integer fInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("f_pro_status")
+    private Integer fProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("f_out_tran_status")
+    private Integer fOutTranStatus;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("t_task_id")
+    private Long tTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("t_det_task_code")
+    private String tDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("t_equipment_type_id")
+    private Long tEquipmentTypeId;
+
+    /**
+     * 设备名称
+     */
+    @TableField("t_equipment_name")
+    private String tEquipmentName;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("t_equipment_id")
+    private Long tEquipmentId;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("t_craft_code_id")
+    private Long tCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("t_plc_value")
+    private Integer tPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("t_in_tran_status")
+    private Integer tInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("t_pro_status")
+    private Integer tProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("t_out_tran_status")
+    private Integer tOutTranStatus;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("th_task_id")
+    private Long thTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("th_det_task_code")
+    private String thDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("th_equipment_type_id")
+    private Long thEquipmentTypeId;
+
+    /**
+     * 设备名称
+     */
+    @TableField("th_equipment_name")
+    private String thEquipmentName;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("th_equipment_id")
+    private Long thEquipmentId;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("th_craft_code_id")
+    private Long thCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("th_plc_value")
+    private Integer thPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("th_in_tran_status")
+    private Integer thInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("th_pro_status")
+    private Integer thProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("th_out_tran_status")
+    private Integer thOutTranStatus;
+
+    /**
+     * 备注
+     */
+    @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 STATUS = "status";
+
+    public static final String INTER_CODE = "inter_code";
+
+    public static final String PROCESS_FLOW_ID = "process_flow_id";
+
+    public static final String PROCESS_FLOW_NAME = "process_flow_name";
+
+    public static final String PROCESS_FLOW_TYPE = "process_flow_type";
+
+    public static final String CRAFT_CODE_ID = "craft_code_id";
+
+    public static final String CRAFT_CODE = "craft_code";
+
+    public static final String WAREHOUSE_ID = "warehouse_id";
+
+    public static final String F_TASK_ID = "f_task_id";
+
+    public static final String F_DET_TASK_CODE = "f_det_task_code";
+
+    public static final String F_EQUIPMENT_TYPE_ID = "f_equipment_type_id";
+
+    public static final String F_EQUIPMENT_ID = "f_equipment_id";
+
+    public static final String F_EQUIPMENT_NAME = "f_equipment_name";
+
+    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+
+    public static final String F_PLC_VALUE = "f_plc_value";
+
+    public static final String F_IN_TRAN_STATUS = "f_in_tran_status";
+
+    public static final String F_PRO_STATUS = "f_pro_status";
+
+    public static final String F_OUT_TRAN_STATUS = "f_out_tran_status";
+
+    public static final String T_TASK_ID = "t_task_id";
+
+    public static final String T_DET_TASK_CODE = "t_det_task_code";
+
+    public static final String T_EQUIPMENT_TYPE_ID = "t_equipment_type_id";
+
+    public static final String T_EQUIPMENT_NAME = "t_equipment_name";
+
+    public static final String T_EQUIPMENT_ID = "t_equipment_id";
+
+    public static final String T_CRAFT_CODE_ID = "t_craft_code_id";
+
+    public static final String T_PLC_VALUE = "t_plc_value";
+
+    public static final String T_IN_TRAN_STATUS = "t_in_tran_status";
+
+    public static final String T_PRO_STATUS = "t_pro_status";
+
+    public static final String T_OUT_TRAN_STATUS = "t_out_tran_status";
+
+    public static final String TH_TASK_ID = "th_task_id";
+
+    public static final String TH_DET_TASK_CODE = "th_det_task_code";
+
+    public static final String TH_EQUIPMENT_TYPE_ID = "th_equipment_type_id";
+
+    public static final String TH_EQUIPMENT_NAME = "th_equipment_name";
+
+    public static final String TH_EQUIPMENT_ID = "th_equipment_id";
+
+    public static final String TH_CRAFT_CODE_ID = "th_craft_code_id";
+
+    public static final String TH_PLC_VALUE = "th_plc_value";
+
+    public static final String TH_IN_TRAN_STATUS = "th_in_tran_status";
+
+    public static final String TH_PRO_STATUS = "th_pro_status";
+
+    public static final String TH_OUT_TRAN_STATUS = "th_out_tran_status";
+
+    public static final String CONTENT = "content";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AutoExeTaskHis.java

@@ -0,0 +1,348 @@
+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>
+ * 自动执行任务表
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_auto_exe_task_his")
+public class AutoExeTaskHis extends Model<AutoExeTaskHis> {
+
+    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;
+
+    /**
+     * 状态，0：新增，1：执行中，2完成
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 内部编码，系统自动生成
+     */
+    @TableField("inter_code")
+    private String interCode;
+
+    /**
+     * 工艺流程ID
+     */
+    @TableField("process_flow_id")
+    private Long processFlowId;
+
+    /**
+     * 工艺流程名称
+     */
+    @TableField("process_flow_name")
+    private String processFlowName;
+
+    /**
+     * 工艺类型，1表示第一种工艺流程，2表示第二种工艺流程
+     */
+    @TableField("process_flow_type")
+    private Integer processFlowType;
+
+    /**
+     * 工艺号ID
+     */
+    @TableField("craft_code_id")
+    private Long craftCodeId;
+
+    /**
+     * 工艺编码
+     */
+    @TableField("craft_code")
+    private String craftCode;
+
+    /**
+     * 区域ID，区分不同操作区域
+     */
+    @TableField("warehouse_id")
+    private Long warehouseId;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("f_task_id")
+    private Long fTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("f_det_task_code")
+    private String fDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("f_equipment_type_id")
+    private Long fEquipmentTypeId;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("f_equipment_id")
+    private Long fEquipmentId;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("f_craft_code_id")
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("f_in_tran_status")
+    private Integer fInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("f_pro_status")
+    private Integer fProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("f_out_tran_status")
+    private Integer fOutTranStatus;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("t_task_id")
+    private Long tTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("t_det_task_code")
+    private String tDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("t_equipment_type_id")
+    private Long tEquipmentTypeId;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("t_equipment_id")
+    private Long tEquipmentId;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("t_craft_code_id")
+    private Long tCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("t_plc_value")
+    private Integer tPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("t_in_tran_status")
+    private Integer tInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("t_pro_status")
+    private Integer tProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("t_out_tran_status")
+    private Integer tOutTranStatus;
+
+    /**
+     * 执行任务ID，关联任务表：t_curr_task
+     */
+    @TableField("th_task_id")
+    private Long thTaskId;
+
+    /**
+     * 任务编码,子任务编码对应任务表t_curr_task中task_code编码
+     */
+    @TableField("th_det_task_code")
+    private String thDetTaskCode;
+
+    /**
+     * 设备类型ID，关联设备类型表：t_equipment_type
+     */
+    @TableField("th_equipment_type_id")
+    private Long thEquipmentTypeId;
+
+    /**
+     * 设备ID，关联设备表：t_kiln_info
+     */
+    @TableField("th_equipment_id")
+    private Long thEquipmentId;
+
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("th_craft_code_id")
+    private Long thCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("th_plc_value")
+    private Integer thPlcValue;
+
+    /**
+     * 进炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("th_in_tran_status")
+    private Integer thInTranStatus;
+
+    /**
+     * 加工状态，0：加工开始，1：加工中，2：加工完成
+     */
+    @TableField("th_pro_status")
+    private Integer thProStatus;
+
+    /**
+     * 出炉运输状态，0：开始，1：运输中，2：运输完成
+     */
+    @TableField("th_out_tran_status")
+    private Integer thOutTranStatus;
+
+    /**
+     * 备注
+     */
+    @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 STATUS = "status";
+
+    public static final String INTER_CODE = "inter_code";
+
+    public static final String PROCESS_FLOW_ID = "process_flow_id";
+
+    public static final String PROCESS_FLOW_NAME = "process_flow_name";
+
+    public static final String PROCESS_FLOW_TYPE = "process_flow_type";
+
+    public static final String CRAFT_CODE_ID = "craft_code_id";
+
+    public static final String CRAFT_CODE = "craft_code";
+
+    public static final String WAREHOUSE_ID = "warehouse_id";
+
+    public static final String F_TASK_ID = "f_task_id";
+
+    public static final String F_DET_TASK_CODE = "f_det_task_code";
+
+    public static final String F_EQUIPMENT_TYPE_ID = "f_equipment_type_id";
+
+    public static final String F_EQUIPMENT_ID = "f_equipment_id";
+
+    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+
+    public static final String F_PLC_VALUE = "f_plc_value";
+
+    public static final String F_IN_TRAN_STATUS = "f_in_tran_status";
+
+    public static final String F_PRO_STATUS = "f_pro_status";
+
+    public static final String F_OUT_TRAN_STATUS = "f_out_tran_status";
+
+    public static final String T_TASK_ID = "t_task_id";
+
+    public static final String T_DET_TASK_CODE = "t_det_task_code";
+
+    public static final String T_EQUIPMENT_TYPE_ID = "t_equipment_type_id";
+
+    public static final String T_EQUIPMENT_ID = "t_equipment_id";
+
+    public static final String T_CRAFT_CODE_ID = "t_craft_code_id";
+
+    public static final String T_PLC_VALUE = "t_plc_value";
+
+    public static final String T_IN_TRAN_STATUS = "t_in_tran_status";
+
+    public static final String T_PRO_STATUS = "t_pro_status";
+
+    public static final String T_OUT_TRAN_STATUS = "t_out_tran_status";
+
+    public static final String TH_TASK_ID = "th_task_id";
+
+    public static final String TH_DET_TASK_CODE = "th_det_task_code";
+
+    public static final String TH_EQUIPMENT_TYPE_ID = "th_equipment_type_id";
+
+    public static final String TH_EQUIPMENT_ID = "th_equipment_id";
+
+    public static final String TH_CRAFT_CODE_ID = "th_craft_code_id";
+
+    public static final String TH_PLC_VALUE = "th_plc_value";
+
+    public static final String TH_IN_TRAN_STATUS = "th_in_tran_status";
+
+    public static final String TH_PRO_STATUS = "th_pro_status";
+
+    public static final String TH_OUT_TRAN_STATUS = "th_out_tran_status";
+
+    public static final String CONTENT = "content";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java

@@ -11,11 +11,11 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 当前任务
+ * 任务表
  * </p>
  *
  * @author mt
- * @since 2021-12-09
+ * @since 2021-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -67,7 +67,7 @@ public class CurrTask extends Model<CurrTask> {
     private String version;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -79,52 +79,64 @@ public class CurrTask extends Model<CurrTask> {
     private String interCode;
 
     /**
-     * 任务编码, 查看任务编码规则
+     * 是否自动执行：	0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
      */
-    @TableField("task_code")
-    private String taskCode;
+    @TableField("is_auto")
+    private Integer isAuto;
 
     /**
-     * 生产单号 APMS生成生产单后返回
+     * 任务流程ID，关联流程表：t_auto_exe_task
      */
-    @TableField("sheet_no")
-    private String sheetNo;
+    @TableField("auto_exe_task_id")
+    private Long autoExeTaskId;
 
     /**
-     * 任务来源  0：人工 扩展字段
+     * 工业炉id，关联设备工业炉表：t_kiln_info
      */
-    @TableField("task_source")
-    private Integer taskSource;
+    @TableField("kiln_id")
+    private Long kilnId;
 
     /**
-     * 任务类型：0:入库到窑炉，1:入库到缓存区，2出库到	窑炉到缓存区，3缓存区出库
+     * 工业炉名称
      */
-    @TableField("task_type")
-    private Integer taskType;
+    @TableField("kiln_name")
+    private String kilnName;
 
     /**
-     * 加工类型：0 初始加工，1 复加工 ，2 追加加工
+     * 工艺号ID，关联工艺号表：t_craft_info
      */
-    @TableField("process_type")
-    private Integer processType;
+    @TableField("craft_code_id")
+    private Long craftCodeId;
 
     /**
-     * 托盘编码
+     * 工艺号对应PLC值
      */
-    @TableField("pallet_code")
-    private String palletCode;
+    @TableField("plc_value")
+    private Integer plcValue;
 
     /**
-     * 缓存前开始时间，车辆开始执行
+     * 开始加工时间
      */
-    @TableField("a_begin_time")
-    private LocalDateTime aBeginTime;
+    @TableField("begin_time")
+    private LocalDateTime beginTime;
 
     /**
-     * 完成当前任务时间（可能是到缓存区，有可能直接到窑炉），车辆放完货物到缓存区收到的时间
+     * 加工结束时间
      */
-    @TableField("a_end_time")
-    private LocalDateTime aEndTime;
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 进炉状态：	0准备进炉，1正在加工，2加工完成
+     */
+    @TableField("is_in")
+    private Integer isIn;
+
+    /**
+     * 调度任务ID，关联调度表：t_run_task
+     */
+    @TableField("run_task_id")
+    private Long runTaskId;
 
     /**
      * 开始位置
@@ -133,35 +145,29 @@ public class CurrTask extends Model<CurrTask> {
     private String startPosition;
 
     /**
-     * 目标位置指的是窑炉的位置
+     * 目标位置指的是工业炉的位置
      */
     @TableField("target_position")
     private String targetPosition;
 
     /**
-     * 窑炉id，关联设备窑炉表：t_kiln_info
-     */
-    @TableField("kiln_id")
-    private Long kilnId;
-
-    /**
-     * 窑炉名称
-     */
-    @TableField("kiln_name")
-    private String kilnName;
-
-    /**
-     * 车辆id，关联车辆表：t_vehicle_info
-     */
-    @TableField("vehicle_id")
-    private Long vehicleId;
-
-    /**
-     * 是否缓存，如果当前指的窑炉正在加工，系统自动分配货物到缓存位置，		      并且记录缓存库位，这是当指定窑炉加工完成后系统先判断是否当前缓存有当前等待执行的任务，然后按照先来先执行原则（等待多个任务）自动调用车辆来执行
+     * 是否缓存，如果当前指的工业炉正在加工，系统自动分配货物到缓存位置，		      并且记录缓存库位，这是当指定工业炉加工完成后系统先判断是否当前缓存有当前等待执行的任务，然后按照先来先执行原则（等待多个任务）自动调用车辆来执行
      */
     @TableField("is_cache")
     private Integer isCache;
 
+    /**
+     * 缓存状态状态：	0准备进入缓存区，1正在进入缓存区，2缓存完成
+     */
+    @TableField("cache_satatus")
+    private Integer cacheSatatus;
+
+    /**
+     * 调度任务ID，关联调度表：t_run_task
+     */
+    @TableField("cache_run_task_id")
+    private Long cacheRunTaskId;
+
     /**
      * 库位id，关联库位表：t_location
      */
@@ -175,16 +181,58 @@ public class CurrTask extends Model<CurrTask> {
     private String locationName;
 
     /**
-     * 工艺号ID，关联工艺号表：t_craft_info
+     * 出炉状态：	0准备出炉，1正在加工，2加工完成
      */
-    @TableField("f_craft_code_id")
-    private Long fCraftCodeId;
+    @TableField("is_out")
+    private Integer isOut;
 
     /**
-     * 工艺号对应PLC值
+     * 调度任务ID，关联调度表：t_run_task
      */
-    @TableField("f_plc_value")
-    private Integer fPlcValue;
+    @TableField("out_run_task_id")
+    private Long outRunTaskId;
+
+    /**
+     * 开始位置
+     */
+    @TableField("out_start_position")
+    private String outStartPosition;
+
+    /**
+     * 目标位置，指缓存位置
+     */
+    @TableField("out_target_position")
+    private String outTargetPosition;
+
+    /**
+     * 任务编码
+     */
+    @TableField("task_code")
+    private String taskCode;
+
+    /**
+     * 生产单号 APMS生成生产单后返回
+     */
+    @TableField("sheet_no")
+    private String sheetNo;
+
+    /**
+     * 任务类型：0:入库到工业炉，1:入库到缓存区，2出库到	工业炉到缓存区，3缓存区出库
+     */
+    @TableField("task_type")
+    private Integer taskType;
+
+    /**
+     * 加工类型：0 初始加工，1 复加工
+     */
+    @TableField("process_type")
+    private Integer processType;
+
+    /**
+     * 炉号
+     */
+    @TableField("stove_code")
+    private String stoveCode;
 
 
     public static final String ID = "id";
@@ -205,41 +253,57 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String INTER_CODE = "inter_code";
 
-    public static final String TASK_CODE = "task_code";
+    public static final String IS_AUTO = "is_auto";
 
-    public static final String SHEET_NO = "sheet_no";
-
-    public static final String TASK_SOURCE = "task_source";
-
-    public static final String TASK_TYPE = "task_type";
-
-    public static final String PROCESS_TYPE = "process_type";
-
-    public static final String PALLET_CODE = "pallet_code";
-
-    public static final String A_BEGIN_TIME = "a_begin_time";
-
-    public static final String A_END_TIME = "a_end_time";
-
-    public static final String START_POSITION = "start_position";
-
-    public static final String TARGET_POSITION = "target_position";
+    public static final String AUTO_EXE_TASK_ID = "auto_exe_task_id";
 
     public static final String KILN_ID = "kiln_id";
 
     public static final String KILN_NAME = "kiln_name";
 
-    public static final String VEHICLE_ID = "vehicle_id";
+    public static final String CRAFT_CODE_ID = "craft_code_id";
+
+    public static final String PLC_VALUE = "plc_value";
+
+    public static final String BEGIN_TIME = "begin_time";
+
+    public static final String END_TIME = "end_time";
+
+    public static final String IS_IN = "is_in";
+
+    public static final String RUN_TASK_ID = "run_task_id";
+
+    public static final String START_POSITION = "start_position";
+
+    public static final String TARGET_POSITION = "target_position";
 
     public static final String IS_CACHE = "is_cache";
 
+    public static final String CACHE_SATATUS = "cache_satatus";
+
+    public static final String CACHE_RUN_TASK_ID = "cache_run_task_id";
+
     public static final String LOCATION_ID = "location_id";
 
     public static final String LOCATION_NAME = "location_name";
 
-    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+    public static final String IS_OUT = "is_out";
 
-    public static final String F_PLC_VALUE = "f_plc_value";
+    public static final String OUT_RUN_TASK_ID = "out_run_task_id";
+
+    public static final String OUT_START_POSITION = "out_start_position";
+
+    public static final String OUT_TARGET_POSITION = "out_target_position";
+
+    public static final String TASK_CODE = "task_code";
+
+    public static final String SHEET_NO = "sheet_no";
+
+    public static final String TASK_TYPE = "task_type";
+
+    public static final String PROCESS_TYPE = "process_type";
+
+    public static final String STOVE_CODE = "stove_code";
 
     @Override
     protected Serializable pkVal() {

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-11-18
+ * @since 2021-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

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-11-19
+ * @since 2021-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -71,7 +71,7 @@ public class InStockInfo extends Model<InStockInfo> {
     private String version;
 
     /**
-     * 状态：	0等待出库，1到窑炉前缓存
+     * 状态：	0未开始执行，1正在执行，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -95,13 +95,13 @@ public class InStockInfo extends Model<InStockInfo> {
     private Long taskId;
 
     /**
-     * 窑炉id ，if(status == 0){从窑炉出来等待库存} else if(status == 1){到目标窑炉前缓存到库位}关联设备窑炉表：t_kiln_info
+     * 工业炉id ，if(status == 0){从工业炉出来等待库存} else if(status == 1){到目标工业炉前缓存到库位}关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
     private Long kilnId;
 
     /**
-     * 窑炉名称
+     * 工业炉名称
      */
     @TableField("kiln_name")
     private String kilnName;
@@ -124,6 +124,18 @@ public class InStockInfo extends Model<InStockInfo> {
     @TableField("pallet_code")
     private String palletCode;
 
+    /**
+     * 类型：	0等待出库，1到工业炉前缓存，2插单任务缓存
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 进入缓存区的时间，插单任务按倒叙执行，正常任务按顺序执行
+     */
+    @TableField("in_time")
+    private LocalDateTime inTime;
+
 
     public static final String ID = "id";
 
@@ -157,6 +169,10 @@ public class InStockInfo extends Model<InStockInfo> {
 
     public static final String PALLET_CODE = "pallet_code";
 
+    public static final String TYPE = "type";
+
+    public static final String IN_TIME = "in_time";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfoHis.java

@@ -15,11 +15,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 缓存表存储历史情况
+ * 缓存区存储历史情况
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -71,7 +71,7 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
     private String version;
 
     /**
-     * 状态：	0等待出库，1到窑炉前缓存
+     * 状态：	0未开始执行，1正在执行，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -95,13 +95,13 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
     private Integer taskId;
 
     /**
-     * 窑炉id ，if(status == 0){从窑炉出来等待库存} else if(status == 1){到目标窑炉前缓存到库位}关联设备窑炉表：t_kiln_info
+     * 工业炉id ，if(status == 0){从工业炉出来等待库存} else if(status == 1){到目标工业炉前缓存到库位}关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
     private Integer kilnId;
 
     /**
-     * 窑炉名称
+     * 工业炉名称
      */
     @TableField("kiln_name")
     private String kilnName;
@@ -124,6 +124,18 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
     @TableField("pallet_code")
     private String palletCode;
 
+    /**
+     * 类型：	0等待出库，1到工业炉前缓存，2插单任务缓存
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 进入缓存区的时间，插单任务按倒叙执行，正常任务按顺序执行
+     */
+    @TableField("in_time")
+    private String inTime;
+
 
     public static final String ID = "id";
 
@@ -157,6 +169,10 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
 
     public static final String PALLET_CODE = "pallet_code";
 
+    public static final String TYPE = "type";
+
+    public static final String IN_TIME = "in_time";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/KilnInfo.java

@@ -15,11 +15,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 窑炉信息
+ * 工业炉信息
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-02-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -71,7 +71,7 @@ public class KilnInfo extends Model<KilnInfo> {
     private String version;
 
     /**
-     * 状态	0初始化，1损坏
+     * 状态	0初始化，1损坏 ，2 工作中
      */
     @TableField("status")
     private Integer status;
@@ -83,7 +83,7 @@ public class KilnInfo extends Model<KilnInfo> {
     private String interCode;
 
     /**
-     * 编码
+     * 编码 必须与AMPS相同
      */
     @TableField("code")
     private String code;
@@ -95,13 +95,13 @@ public class KilnInfo extends Model<KilnInfo> {
     private Integer factoryId;
 
     /**
-     * 窑炉名称
+     * 工业炉名称 建议与AMPS相同
      */
     @TableField("kiln_name")
     private String kilnName;
 
     /**
-     * 窑炉别名
+     * 工业炉别名
      */
     @TableField("kiln_alias")
     private String kilnAlias;
@@ -113,10 +113,10 @@ public class KilnInfo extends Model<KilnInfo> {
     private String en;
 
     /**
-     * 设备类型，存储数据字典编码
+     * 设备类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉
      */
     @TableField("type")
-    private String type;
+    private Integer type;
 
     /**
      * ip地址

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-09
+ * @since 2021-12-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,7 +73,7 @@ public class OrderInfo extends Model<OrderInfo> {
     private Integer orderSource;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -97,7 +97,7 @@ public class OrderInfo extends Model<OrderInfo> {
     private String orderNo;
 
     /**
-     * 原订单号，APMS系统获取 返单时才存在
+     * 原订单号(对应原先的标识卡号)，APMS系统获取 返单时才存在
      */
     @TableField("old_order_no")
     private String oldOrderNo;
@@ -186,6 +186,12 @@ public class OrderInfo extends Model<OrderInfo> {
     @TableField("orther_b")
     private String ortherB;
 
+    /**
+     * 是否作废 1:正常 0:作废
+     */
+    @TableField("order_void")
+    private Integer orderVoid;
+
 
     public static final String ID = "id";
 
@@ -241,6 +247,8 @@ public class OrderInfo extends Model<OrderInfo> {
 
     public static final String ORTHER_B = "orther_b";
 
+    public static final String ORDER_VOID = "order_void";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-09
+ * @since 2021-12-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,7 +73,7 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
     private Integer orderSource;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -162,6 +162,12 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
     @TableField("quantity")
     private Float quantity;
 
+    /**
+     * 是否作废 0：正常 ，1：作废
+     */
+    @TableField("order_void")
+    private Integer orderVoid;
+
 
     public static final String ID = "id";
 
@@ -209,6 +215,8 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
 
     public static final String QUANTITY = "quantity";
 
+    public static final String ORDER_VOID = "order_void";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParEleValue.java

@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 窑炉电能参数值
+ * 工业炉电能参数值
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,10 +50,16 @@ public class ParEleValue extends Model<ParEleValue> {
     private Integer status;
 
     /**
-     * 窑炉id，关联设备窑炉表：t_kiln_info
+     * 工业炉id，关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
-    private Integer kilnId;
+    private Long kilnId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private Long taskId;
 
     /**
      * 参数id，关联参数表：t_par_info
@@ -104,10 +110,10 @@ public class ParEleValue extends Model<ParEleValue> {
     private Float totalBat;
 
     /**
-     * 扩展字段1
+     * 时间段类型。0：半小时，1：天，2:月
      */
-    @TableField("add_a")
-    private Float addA;
+    @TableField("date_type")
+    private Integer dateType;
 
     /**
      * 扩展字段2
@@ -150,6 +156,8 @@ public class ParEleValue extends Model<ParEleValue> {
 
     public static final String KILN_ID = "kiln_id";
 
+    public static final String TASK_ID = "task_id";
+
     public static final String PAR_ID = "par_id";
 
     public static final String A_VOLTAGEV_VALUE = "a_voltagev_value";
@@ -166,7 +174,7 @@ public class ParEleValue extends Model<ParEleValue> {
 
     public static final String TOTAL_BAT = "total_bat";
 
-    public static final String ADD_A = "add_a";
+    public static final String DATE_TYPE = "date_type";
 
     public static final String ADD_B = "add_b";
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParGasValue.java

@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 窑炉使用气检测值
+ * 工业炉使用气检测值
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,10 +50,16 @@ public class ParGasValue extends Model<ParGasValue> {
     private Integer status;
 
     /**
-     * 窑炉id，关联设备窑炉表：t_kiln_info
+     * 工业炉id，关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
-    private Integer kilnId;
+    private Long kilnId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private Long taskId;
 
     /**
      * 参数id，关联参数表：t_par_info
@@ -62,13 +68,13 @@ public class ParGasValue extends Model<ParGasValue> {
     private Integer parId;
 
     /**
-     * 设定氮势值
+     * 设定氮/碳势值
      */
     @TableField("set_nit_pot_value")
     private Float setNitPotValue;
 
     /**
-     * 实际氮势值
+     * 实际氮/碳势值
      */
     @TableField("actual_nit_pot_value")
     private Float actualNitPotValue;
@@ -80,46 +86,46 @@ public class ParGasValue extends Model<ParGasValue> {
     private Float acceptNitPotValue;
 
     /**
-     * 氮气流量
+     * 氮气量
      */
     @TableField("nit_flow_value")
     private Float nitFlowValue;
 
     /**
-     * 氨气流量
+     * 氨气量
      */
     @TableField("ammonia_flow_value")
     private Float ammoniaFlowValue;
 
     /**
-     * 二氧化碳流量
+     * 二氧化碳量
      */
     @TableField("car_dioxide_flow_value")
     private Float carDioxideFlowValue;
 
     /**
-     * 扩展字段1
+     * 甲烷量
      */
-    @TableField("add_a")
-    private Float addA;
+    @TableField("methanol_flow")
+    private Float methanolFlow;
 
     /**
-     * 扩展字段2
+     * 丙烷量
      */
-    @TableField("add_b")
-    private Float addB;
+    @TableField("propane_flow")
+    private Float propaneFlow;
 
     /**
-     * 扩展字段3
+     * 氢含量
      */
-    @TableField("add_c")
-    private Float addC;
+    @TableField("hydrogen_content")
+    private Float hydrogenContent;
 
     /**
-     * 扩展字段4
+     * 分解率
      */
-    @TableField("orther_a")
-    private String ortherA;
+    @TableField("decomposition_rate")
+    private Float decompositionRate;
 
     /**
      * 扩展字段5
@@ -144,6 +150,8 @@ public class ParGasValue extends Model<ParGasValue> {
 
     public static final String KILN_ID = "kiln_id";
 
+    public static final String TASK_ID = "task_id";
+
     public static final String PAR_ID = "par_id";
 
     public static final String SET_NIT_POT_VALUE = "set_nit_pot_value";
@@ -158,13 +166,13 @@ public class ParGasValue extends Model<ParGasValue> {
 
     public static final String CAR_DIOXIDE_FLOW_VALUE = "car_dioxide_flow_value";
 
-    public static final String ADD_A = "add_a";
+    public static final String METHANOL_FLOW = "methanol_flow";
 
-    public static final String ADD_B = "add_b";
+    public static final String PROPANE_FLOW = "propane_flow";
 
-    public static final String ADD_C = "add_c";
+    public static final String HYDROGEN_CONTENT = "hydrogen_content";
 
-    public static final String ORTHER_A = "orther_a";
+    public static final String DECOMPOSITION_RATE = "decomposition_rate";
 
     public static final String ORTHER_B = "orther_b";
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParRotSpeedValue.java

@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 窑炉运转速度
+ * 工业炉运转速度
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,10 +50,16 @@ public class ParRotSpeedValue extends Model<ParRotSpeedValue> {
     private Integer status;
 
     /**
-     * 窑炉id，关联设备窑炉表：t_kiln_info
+     * 工业炉id，关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
-    private Integer kilnId;
+    private Long kilnId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private Long taskId;
 
     /**
      * 参数id，关联参数表：t_par_info
@@ -156,6 +162,8 @@ public class ParRotSpeedValue extends Model<ParRotSpeedValue> {
 
     public static final String KILN_ID = "kiln_id";
 
+    public static final String TASK_ID = "task_id";
+
     public static final String PAR_ID = "par_id";
 
     public static final String FAN_SPEED_A_VALUE = "fan_speed_a_value";

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParTemValue.java

@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 窑炉温度监控
+ * 工业炉温度监控
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,10 +50,16 @@ public class ParTemValue extends Model<ParTemValue> {
     private Integer status;
 
     /**
-     * 窑炉id，关联设备窑炉表：t_kiln_info
+     * 工业炉id，关联设备工业炉表：t_kiln_info
      */
     @TableField("kiln_id")
-    private Integer kilnId;
+    private Long kilnId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private Long taskId;
 
     /**
      * 参数id，关联参数表：t_par_info
@@ -98,22 +104,22 @@ public class ParTemValue extends Model<ParTemValue> {
     private Float takeOverOilSetTemValue;
 
     /**
-     * 扩展字段1
+     * 外一区温度
      */
-    @TableField("add_a")
-    private Float addA;
+    @TableField("outer_zone1_temp")
+    private Float outerZone1Temp;
 
     /**
-     * 扩展字段2
+     * 外二区温度
      */
-    @TableField("add_b")
-    private Float addB;
+    @TableField("outer_zone2_temp")
+    private Float outerZone2Temp;
 
     /**
-     * 扩展字段3
+     * 炉压
      */
-    @TableField("add_c")
-    private Float addC;
+    @TableField("furnace_pressure")
+    private Float furnacePressure;
 
     /**
      * 扩展字段4
@@ -144,6 +150,8 @@ public class ParTemValue extends Model<ParTemValue> {
 
     public static final String KILN_ID = "kiln_id";
 
+    public static final String TASK_ID = "task_id";
+
     public static final String PAR_ID = "par_id";
 
     public static final String SET_TEM_VALUE = "set_tem_value";
@@ -158,11 +166,11 @@ public class ParTemValue extends Model<ParTemValue> {
 
     public static final String TAKE_OVER_OIL_SET_TEM_VALUE = "take_over_oil_set_tem_value";
 
-    public static final String ADD_A = "add_a";
+    public static final String OUTER_ZONE1_TEMP = "outer_zone1_temp";
 
-    public static final String ADD_B = "add_b";
+    public static final String OUTER_ZONE2_TEMP = "outer_zone2_temp";
 
-    public static final String ADD_C = "add_c";
+    public static final String FURNACE_PRESSURE = "furnace_pressure";
 
     public static final String ORTHER_A = "orther_a";
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/PlcNameSpace.java

@@ -0,0 +1,98 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * PLC变量nameSpace对照表
+ * </p>
+ *
+ * @author mt
+ * @since 2022-02-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_plc_name_space")
+public class PlcNameSpace extends Model<PlcNameSpace> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableField("id")
+    private Long id;
+
+    /**
+     * 设备类型，1：多用加工炉，2：氮化炉，3：回火炉，4：清洗机，5:rgv
+     */
+    @TableField("eq_type")
+    private Integer eqType;
+
+    /**
+     * 变量名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 变量的含义
+     */
+    @TableField("note")
+    private String note;
+
+    /**
+     * 设备id
+     */
+    @TableField("eq_id")
+    private Long eqId;
+
+    /**
+     * 设备名称
+     */
+    @TableField("eq_name")
+    private String eqName;
+
+    /**
+     * 变量类型，0：变量，1：报警变量
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    public static final String ID = "id";
+
+    public static final String EQ_TYPE = "eq_type";
+
+    public static final String NAME = "name";
+
+    public static final String NOTE = "note";
+
+    public static final String EQ_ID = "eq_id";
+
+    public static final String EQ_NAME = "eq_name";
+
+    public static final String TYPE = "type";
+
+    public static final String REMARK = "remark";
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/PointInfo.java

@@ -0,0 +1,91 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 点位信息表
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_point_info")
+public class PointInfo extends Model<PointInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableField("id")
+    private Integer id;
+
+    /**
+     * 点位编码，对应plc
+     */
+    @TableField("code")
+    private Long code;
+
+    /**
+     * 点位对应的设备名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 点位说明；关联对应表数据的code，工业炉code,库位code等等
+     */
+    @TableField("note")
+    private String note;
+
+    /**
+     * 类型：1 炉子，2 液压台，3 库位
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 距离原点的距离
+     */
+    @TableField("distance")
+    private Double distance;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDate createTime;
+
+
+    public static final String ID = "id";
+
+    public static final String CODE = "code";
+
+    public static final String NAME = "name";
+
+    public static final String NOTE = "note";
+
+    public static final String TYPE = "type";
+
+    public static final String DISTANCE = "distance";
+
+    public static final String CREATE_TIME = "create_time";
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/QuestionAnswer.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>
+ * 问题解答表
+ * </p>
+ *
+ * @author mt
+ * @since 2022-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_question_answer")
+public class QuestionAnswer extends Model<QuestionAnswer> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用
+     */
+    @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初始化
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 内部编码
+     */
+    @TableField("inter_code")
+    private String interCode;
+
+    /**
+     * 编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 问题
+     */
+    @TableField("question")
+    private String question;
+
+    /**
+     * 解答
+     */
+    @TableField("answer")
+    private String answer;
+
+    /**
+     * 描述信息
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 备注
+     */
+    @TableField("note")
+    private String note;
+
+
+    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 STATUS = "status";
+
+    public static final String INTER_CODE = "inter_code";
+
+    public static final String CODE = "code";
+
+    public static final String QUESTION = "question";
+
+    public static final String ANSWER = "answer";
+
+    public static final String DESCRIPTION = "description";
+
+    public static final String NOTE = "note";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/RunTask.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2021-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -71,11 +71,17 @@ public class RunTask extends Model<RunTask> {
     private String version;
 
     /**
-     * 任务id,关联wcs_task表
+     * 任务id,关联curr_task表
      */
     @TableField("task_id")
     private Long taskId;
 
+    /**
+     * 任务编码, 查看任务编码规则
+     */
+    @TableField("task_code")
+    private String taskCode;
+
     /**
      * 开始位置
      */
@@ -88,6 +94,24 @@ public class RunTask extends Model<RunTask> {
     @TableField("end_position")
     private String endPosition;
 
+    /**
+     * 车辆id，关联车辆表：t_vehicle_info
+     */
+    @TableField("vehicle_id")
+    private Long vehicleId;
+
+    /**
+     * 任务开始时间，车辆接收任务时间
+     */
+    @TableField("begin_time")
+    private LocalDateTime beginTime;
+
+    /**
+     * 结束时间，车辆完成送货时间
+     */
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
     /**
      * 状态，0：未执行，1：正在执行，2：执行成功，3：执行失败
      */
@@ -111,10 +135,18 @@ public class RunTask extends Model<RunTask> {
 
     public static final String TASK_ID = "task_id";
 
+    public static final String TASK_CODE = "task_code";
+
     public static final String START_POSITION = "start_position";
 
     public static final String END_POSITION = "end_position";
 
+    public static final String VEHICLE_ID = "vehicle_id";
+
+    public static final String BEGIN_TIME = "begin_time";
+
+    public static final String END_TIME = "end_time";
+
     public static final String STATUS = "status";
 
     @Override

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java

@@ -91,8 +91,8 @@ public class TaskDetHis extends Model<TaskDetHis> {
     /**
      * 历史任务id，关联当前任务表：t_task_his
      */
-    @TableField("task_id")
-    private Long taskId;
+    @TableField("curr_task_id")
+    private Long currTaskId;
 
     /**
      * 订单号
@@ -163,7 +163,7 @@ public class TaskDetHis extends Model<TaskDetHis> {
 
     public static final String TASK_CODE = "task_code";
 
-    public static final String TASK_ID = "task_id";
+    public static final String CURR_TASK_ID = "curr_task_id";
 
     public static final String ORDER_NO = "order_no";
 

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-12-09
+ * @since 2022-08-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -67,7 +71,7 @@ public class TaskHis extends Model<TaskHis> {
     private String version;
 
     /**
-     * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
+     * 状态：	0等待执行，1执行中，2执行完成
      */
     @TableField("status")
     private Integer status;
@@ -79,64 +83,16 @@ public class TaskHis extends Model<TaskHis> {
     private String interCode;
 
     /**
-     * 任务编码, 查看任务编码规则
+     * 是否自动执行：	0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
      */
-    @TableField("task_code")
-    private String taskCode;
+    @TableField("is_auto")
+    private Integer isAuto;
 
     /**
-     * 生产单号 APMS生成生产单后返回
+     * 任务流程ID，关联流程表：t_auto_exe_task
      */
-    @TableField("sheet_no")
-    private String sheetNo;
-
-    /**
-     * 任务来源  0：人工 扩展字段
-     */
-    @TableField("task_source")
-    private Integer taskSource;
-
-    /**
-     * 任务类型：0:入库到窑炉，1:入库到缓存区，2:出库到窑炉到缓存区，3:缓存区出库
-     */
-    @TableField("task_type")
-    private Integer taskType;
-
-    /**
-     * 加工类型：0 初始加工，1 复加工 ，2 追加加工
-     */
-    @TableField("process_type")
-    private Integer processType;
-
-    /**
-     * 托盘编码
-     */
-    @TableField("pallet_code")
-    private String palletCode;
-
-    /**
-     * 缓存前开始时间，车辆开始执行
-     */
-    @TableField("a_begin_time")
-    private LocalDateTime aBeginTime;
-
-    /**
-     * 完成当前任务时间（可能是到缓存区，有可能直接到窑炉），车辆放完货物到缓存区收到的时间
-     */
-    @TableField("a_end_time")
-    private LocalDateTime aEndTime;
-
-    /**
-     * 开始位置
-     */
-    @TableField("start_position")
-    private String startPosition;
-
-    /**
-     * 目标位置指的是窑炉的位置
-     */
-    @TableField("target_position")
-    private String targetPosition;
+    @TableField("auto_exe_task_id")
+    private Long autoExeTaskId;
 
     /**
      * 窑炉id，关联设备窑炉表：t_kiln_info
@@ -151,10 +107,52 @@ public class TaskHis extends Model<TaskHis> {
     private String kilnName;
 
     /**
-     * 车辆id，关联车辆表：t_vehicle_info
+     * 工艺号ID，关联工艺号表：t_craft_info
      */
-    @TableField("vehicle_id")
-    private Long vehicleId;
+    @TableField("craft_code_id")
+    private Long craftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("plc_value")
+    private Integer plcValue;
+
+    /**
+     * 开始加工时间
+     */
+    @TableField("begin_time")
+    private LocalDateTime beginTime;
+
+    /**
+     * 加工结束时间
+     */
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 进炉状态：	0准备进炉，1正在加工，2加工完成
+     */
+    @TableField("is_in")
+    private Integer isIn;
+
+    /**
+     * 调度任务ID，关联调度表：t_run_task
+     */
+    @TableField("run_task_id")
+    private Long runTaskId;
+
+    /**
+     * 开始位置
+     */
+    @TableField("start_position")
+    private String startPosition;
+
+    /**
+     * 目标位置指的是窑炉的位置
+     */
+    @TableField("target_position")
+    private String targetPosition;
 
     /**
      * 是否缓存，如果当前指的窑炉正在加工，系统自动分配货物到缓存位置，		      并且记录缓存库位，这是当指定窑炉加工完成后系统先判断是否当前缓存有当前等待执行的任务，然后按照先来先执行原则（等待多个任务）自动调用车辆来执行
@@ -162,6 +160,18 @@ public class TaskHis extends Model<TaskHis> {
     @TableField("is_cache")
     private Integer isCache;
 
+    /**
+     * 缓存状态状态：	0准备进入缓存区，1正在进入缓存区，2缓存完成
+     */
+    @TableField("cache_satatus")
+    private Integer cacheSatatus;
+
+    /**
+     * 调度任务ID，关联调度表：t_run_task
+     */
+    @TableField("cache_run_task_id")
+    private Long cacheRunTaskId;
+
     /**
      * 库位id，关联库位表：t_location
      */
@@ -175,17 +185,64 @@ public class TaskHis extends Model<TaskHis> {
     private String locationName;
 
     /**
-     * 工艺号ID，关联工艺号表：t_craft_info
+     * 出炉状态：	0准备出炉，1正在加工，2加工完成
      */
-    @TableField("f_craft_code_id")
-    private Long fCraftCodeId;
+    @TableField("is_out")
+    private Integer isOut;
 
     /**
-     * 工艺号对应PLC值
+     * 调度任务ID，关联调度表：t_run_task
      */
-    @TableField("f_plc_value")
-    private Integer fPlcValue;
+    @TableField("out_run_task_id")
+    private Long outRunTaskId;
 
+    /**
+     * 开始位置
+     */
+    @TableField("out_start_position")
+    private String outStartPosition;
+
+    /**
+     * 目标位置，指缓存位置
+     */
+    @TableField("out_target_position")
+    private String outTargetPosition;
+
+    /**
+     * 任务编码
+     */
+    @TableField("task_code")
+    private String taskCode;
+
+    /**
+     * 加工类型：0 初始加工，1 复加工
+     */
+    @TableField("process_type")
+    private Integer processType;
+
+    /**
+     * 任务类型：0:入库到窑炉，1:入库到缓存区，2出库到	窑炉到缓存区，3缓存区出库
+     */
+    @TableField("task_type")
+    private Integer taskType;
+
+    /**
+     * 生产单号 APMS生成生产单后返回
+     */
+    @TableField("sheet_no")
+    private String sheetNo;
+
+    /**
+     * 生产单号 APMS生成生产单后返回
+     */
+    @TableField("task_id")
+    private Long taskId;
+
+    /**
+     * 炉号
+     */
+    @TableField("stove_code")
+    private String stoveCode;
 
     public static final String ID = "id";
 
@@ -205,41 +262,59 @@ public class TaskHis extends Model<TaskHis> {
 
     public static final String INTER_CODE = "inter_code";
 
-    public static final String TASK_CODE = "task_code";
+    public static final String IS_AUTO = "is_auto";
 
-    public static final String SHEET_NO = "sheet_no";
-
-    public static final String TASK_SOURCE = "task_source";
-
-    public static final String TASK_TYPE = "task_type";
-
-    public static final String PROCESS_TYPE = "process_type";
-
-    public static final String PALLET_CODE = "pallet_code";
-
-    public static final String A_BEGIN_TIME = "a_begin_time";
-
-    public static final String A_END_TIME = "a_end_time";
-
-    public static final String START_POSITION = "start_position";
-
-    public static final String TARGET_POSITION = "target_position";
+    public static final String AUTO_EXE_TASK_ID = "auto_exe_task_id";
 
     public static final String KILN_ID = "kiln_id";
 
     public static final String KILN_NAME = "kiln_name";
 
-    public static final String VEHICLE_ID = "vehicle_id";
+    public static final String CRAFT_CODE_ID = "craft_code_id";
+
+    public static final String PLC_VALUE = "plc_value";
+
+    public static final String BEGIN_TIME = "begin_time";
+
+    public static final String END_TIME = "end_time";
+
+    public static final String IS_IN = "is_in";
+
+    public static final String RUN_TASK_ID = "run_task_id";
+
+    public static final String START_POSITION = "start_position";
+
+    public static final String TARGET_POSITION = "target_position";
 
     public static final String IS_CACHE = "is_cache";
 
+    public static final String CACHE_SATATUS = "cache_satatus";
+
+    public static final String CACHE_RUN_TASK_ID = "cache_run_task_id";
+
     public static final String LOCATION_ID = "location_id";
 
     public static final String LOCATION_NAME = "location_name";
 
-    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+    public static final String IS_OUT = "is_out";
 
-    public static final String F_PLC_VALUE = "f_plc_value";
+    public static final String OUT_RUN_TASK_ID = "out_run_task_id";
+
+    public static final String OUT_START_POSITION = "out_start_position";
+
+    public static final String OUT_TARGET_POSITION = "out_target_position";
+
+    public static final String TASK_CODE = "task_code";
+
+    public static final String PROCESS_TYPE = "process_type";
+
+    public static final String TASK_TYPE = "task_type";
+
+    public static final String SHEET_NO = "sheet_no";
+
+    public static final String TASK_ID = "task_id";
+
+    public static final String STOVE_CODE = "stove_code";
 
     @Override
     protected Serializable pkVal() {

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-11-18
+ * @since 2021-12-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -71,7 +71,7 @@ public class Warehouse extends Model<Warehouse> {
     private String version;
 
     /**
-     * 状态		0初始化
+     * 状态		0初始化，1已占用
      */
     @TableField("status")
     private Integer status;
@@ -118,6 +118,24 @@ public class Warehouse extends Model<Warehouse> {
     @TableField("note")
     private String note;
 
+    /**
+     * 英文名称
+     */
+    @TableField("english_name")
+    private String englishName;
+
+    /**
+     * 别名
+     */
+    @TableField("alias_name")
+    private String aliasName;
+
+    /**
+     * 库位数量
+     */
+    @TableField("number")
+    private Integer number;
+
 
     public static final String ID = "id";
 
@@ -149,6 +167,12 @@ public class Warehouse extends Model<Warehouse> {
 
     public static final String NOTE = "note";
 
+    public static final String ENGLISH_NAME = "english_name";
+
+    public static final String ALIAS_NAME = "alias_name";
+
+    public static final String NUMBER = "number";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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-11-18
+ * @since 2022-02-28
  */
 public interface AlarmInfoMapper extends BaseMapper<AlarmInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmInfoMapper.xml

@@ -21,11 +21,12 @@
         <result column="alarm_info" property="alarmInfo" />
         <result column="description" property="description" />
         <result column="note" property="note" />
+        <result column="task_code" property="taskCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, equipment_id, equipment_name, type, alarm_code, alarm_info, description, note
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, equipment_id, equipment_name, type, alarm_code, alarm_info, description, note, task_code
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java

@@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2022-01-05
  */
 public interface ApmsCheckResultMapper extends BaseMapper<ApmsCheckResult> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml

@@ -16,12 +16,34 @@
         <result column="hardness" property="hardness"/>
         <result column="metallography" property="metallography"/>
         <result column="heart_hardness" property="heartHardness"/>
+        <result column="remake" property="remake"/>
+        <result column="hardness_value_one" property="hardnessValueOne"/>
+        <result column="hardness_value_two" property="hardnessValueTwo"/>
+        <result column="hardness_value_three" property="hardnessValueThree"/>
+        <result column="metallography_stch_stccsd" property="metallographyStchStccsd"/>
+        <result column="metallography_stch_mstost" property="metallographyStchMstost"/>
+        <result column="metallography_stch_xxklzthw" property="metallographyStchXxklzthw"/>
+        <result column="metallography_stch_dtmstyltst" property="metallographyStchDtmstyltst"/>
+        <result column="metallography_ztch_hhmst" property="metallographyZtchHhmst"/>
+        <result column="metallography_ztch_hhtst" property="metallographyZtchHhtst"/>
+        <result column="metallography_ztch_hhsst" property="metallographyZtchHhsst"/>
+        <result column="metallography_dh_dhhwcs" property="metallographyDhDhhwcs"/>
+        <result column="metallography_dh_kscs" property="metallographyDhKscs"/>
+        <result column="metallography_dh_xb" property="metallographyDhXb"/>
+        <result column="metallography_bmch_btmst" property="metallographyBmchBtmst"/>
+        <result column="metallography_bmch_xb" property="metallographyBmchXb"/>
+        <result column="metallography_bz" property="metallographyBz"/>
+        <result column="metallography_xbyd_xbydjyjg" property="metallographyXbydXbydjyjg"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, valid, create_time, creator_id, updater_id, update_time, version, sheet_no, iden_card_num, hardness,
-        metallography, heart_hardness
+        metallography, heart_hardness, remake, hardness_value_one, hardness_value_two, hardness_value_three,
+        metallography_stch_stccsd, metallography_stch_mstost, metallography_stch_xxklzthw,
+        metallography_stch_dtmstyltst, metallography_ztch_hhmst, metallography_ztch_hhtst, metallography_ztch_hhsst,
+        metallography_dh_dhhwcs, metallography_dh_kscs, metallography_dh_xb, metallography_bmch_btmst,
+        metallography_bmch_xb, metallography_bz, metallography_xbyd_xbydjyjg
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskHisMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.AutoExeTaskHis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 自动执行任务表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-14
+ */
+public interface AutoExeTaskHisMapper extends BaseMapper<AutoExeTaskHis> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskHisMapper.xml

@@ -0,0 +1,53 @@
+<?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.AutoExeTaskHisMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.AutoExeTaskHis">
+        <id column="id" property="id" />
+        <result column="valid" property="valid" />
+        <result column="create_time" property="createTime" />
+        <result column="status" property="status" />
+        <result column="inter_code" property="interCode" />
+        <result column="process_flow_id" property="processFlowId" />
+        <result column="process_flow_name" property="processFlowName" />
+        <result column="process_flow_type" property="processFlowType" />
+        <result column="craft_code_id" property="craftCodeId" />
+        <result column="craft_code" property="craftCode" />
+        <result column="warehouse_id" property="warehouseId" />
+        <result column="f_task_id" property="fTaskId" />
+        <result column="f_det_task_code" property="fDetTaskCode" />
+        <result column="f_equipment_type_id" property="fEquipmentTypeId" />
+        <result column="f_equipment_id" property="fEquipmentId" />
+        <result column="f_craft_code_id" property="fCraftCodeId" />
+        <result column="f_plc_value" property="fPlcValue" />
+        <result column="f_in_tran_status" property="fInTranStatus" />
+        <result column="f_pro_status" property="fProStatus" />
+        <result column="f_out_tran_status" property="fOutTranStatus" />
+        <result column="t_task_id" property="tTaskId" />
+        <result column="t_det_task_code" property="tDetTaskCode" />
+        <result column="t_equipment_type_id" property="tEquipmentTypeId" />
+        <result column="t_equipment_id" property="tEquipmentId" />
+        <result column="t_craft_code_id" property="tCraftCodeId" />
+        <result column="t_plc_value" property="tPlcValue" />
+        <result column="t_in_tran_status" property="tInTranStatus" />
+        <result column="t_pro_status" property="tProStatus" />
+        <result column="t_out_tran_status" property="tOutTranStatus" />
+        <result column="th_task_id" property="thTaskId" />
+        <result column="th_det_task_code" property="thDetTaskCode" />
+        <result column="th_equipment_type_id" property="thEquipmentTypeId" />
+        <result column="th_equipment_id" property="thEquipmentId" />
+        <result column="th_craft_code_id" property="thCraftCodeId" />
+        <result column="th_plc_value" property="thPlcValue" />
+        <result column="th_in_tran_status" property="thInTranStatus" />
+        <result column="th_pro_status" property="thProStatus" />
+        <result column="th_out_tran_status" property="thOutTranStatus" />
+        <result column="content" property="content" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
+    </sql>
+
+</mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.AutoExeTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 自动执行任务表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-04
+ */
+public interface AutoExeTaskMapper extends BaseMapper<AutoExeTask> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.xml

@@ -0,0 +1,56 @@
+<?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.AutoExeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.AutoExeTask">
+        <id column="id" property="id" />
+        <result column="valid" property="valid" />
+        <result column="create_time" property="createTime" />
+        <result column="status" property="status" />
+        <result column="inter_code" property="interCode" />
+        <result column="process_flow_id" property="processFlowId" />
+        <result column="process_flow_name" property="processFlowName" />
+        <result column="process_flow_type" property="processFlowType" />
+        <result column="craft_code_id" property="craftCodeId" />
+        <result column="craft_code" property="craftCode" />
+        <result column="warehouse_id" property="warehouseId" />
+        <result column="f_task_id" property="fTaskId" />
+        <result column="f_det_task_code" property="fDetTaskCode" />
+        <result column="f_equipment_type_id" property="fEquipmentTypeId" />
+        <result column="f_equipment_id" property="fEquipmentId" />
+        <result column="f_equipment_name" property="fEquipmentName" />
+        <result column="f_craft_code_id" property="fCraftCodeId" />
+        <result column="f_plc_value" property="fPlcValue" />
+        <result column="f_in_tran_status" property="fInTranStatus" />
+        <result column="f_pro_status" property="fProStatus" />
+        <result column="f_out_tran_status" property="fOutTranStatus" />
+        <result column="t_task_id" property="tTaskId" />
+        <result column="t_det_task_code" property="tDetTaskCode" />
+        <result column="t_equipment_type_id" property="tEquipmentTypeId" />
+        <result column="t_equipment_name" property="tEquipmentName" />
+        <result column="t_equipment_id" property="tEquipmentId" />
+        <result column="t_craft_code_id" property="tCraftCodeId" />
+        <result column="t_plc_value" property="tPlcValue" />
+        <result column="t_in_tran_status" property="tInTranStatus" />
+        <result column="t_pro_status" property="tProStatus" />
+        <result column="t_out_tran_status" property="tOutTranStatus" />
+        <result column="th_task_id" property="thTaskId" />
+        <result column="th_det_task_code" property="thDetTaskCode" />
+        <result column="th_equipment_type_id" property="thEquipmentTypeId" />
+        <result column="th_equipment_name" property="thEquipmentName" />
+        <result column="th_equipment_id" property="thEquipmentId" />
+        <result column="th_craft_code_id" property="thCraftCodeId" />
+        <result column="th_plc_value" property="thPlcValue" />
+        <result column="th_in_tran_status" property="thInTranStatus" />
+        <result column="th_pro_status" property="thProStatus" />
+        <result column="th_out_tran_status" property="thOutTranStatus" />
+        <result column="content" property="content" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_equipment_name, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_name, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_name, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
+    </sql>
+
+</mapper>

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-11-18
+ * @since 2021-12-14
  */
 public interface CurrTaskDetMapper extends BaseMapper<CurrTaskDet> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 当前任务 Mapper 接口
+ * 任务表 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 public interface CurrTaskMapper extends BaseMapper<CurrTask> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml

@@ -13,31 +13,39 @@
         <result column="version" property="version" />
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
-        <result column="task_code" property="taskCode" />
-        <result column="sheet_no" property="sheetNo"/>
-        <result column="task_source" property="taskSource" />
-        <result column="task_type" property="taskType" />
-        <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"/>
-        <result column="start_position" property="startPosition"/>
-        <result column="target_position" property="targetPosition"/>
-        <result column="kiln_id" property="kilnId"/>
-        <result column="kiln_name" property="kilnName"/>
-        <result column="vehicle_id" property="vehicleId"/>
+        <result column="is_auto" property="isAuto" />
+        <result column="auto_exe_task_id" property="autoExeTaskId" />
+        <result column="kiln_id" property="kilnId" />
+        <result column="kiln_name" property="kilnName" />
+        <result column="craft_code_id" property="craftCodeId" />
+        <result column="plc_value" property="plcValue" />
+        <result column="begin_time" property="beginTime" />
+        <result column="end_time" property="endTime" />
+        <result column="is_in" property="isIn" />
+        <result column="run_task_id" property="runTaskId" />
+        <result column="start_position" property="startPosition" />
+        <result column="target_position" property="targetPosition" />
         <result column="is_cache" property="isCache"/>
+        <result column="cache_satatus" property="cacheSatatus"/>
+        <result column="cache_run_task_id" property="cacheRunTaskId"/>
         <result column="location_id" property="locationId"/>
         <result column="location_name" property="locationName"/>
-        <result column="f_craft_code_id" property="fCraftCodeId"/>
-        <result column="f_plc_value" property="fPlcValue"/>
+        <result column="is_out" property="isOut"/>
+        <result column="out_run_task_id" property="outRunTaskId"/>
+        <result column="out_start_position" property="outStartPosition"/>
+        <result column="out_target_position" property="outTargetPosition"/>
+        <result column="task_code" property="taskCode"/>
+        <result column="sheet_no" property="sheetNo"/>
+        <result column="task_type" property="taskType"/>
+        <result column="process_type" property="processType"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no,
-        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, f_craft_code_id, f_plc_value
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, is_auto,
+        auto_exe_task_id, kiln_id, kiln_name, craft_code_id, plc_value, begin_time, end_time, is_in, run_task_id,
+        start_position, target_position, is_cache, cache_satatus, cache_run_task_id, location_id, location_name, is_out,
+        out_run_task_id, out_start_position, out_target_position, task_code, sheet_no, task_type, process_type
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 缓存表存储历史情况 Mapper 接口
+ * 缓存区存储历史情况 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 public interface InStockInfoHisMapper extends BaseMapper<InStockInfoHis> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.xml

@@ -20,11 +20,13 @@
         <result column="location_id" property="locationId" />
         <result column="location_name" property="locationName" />
         <result column="pallet_code" property="palletCode" />
+        <result column="type" property="type" />
+        <result column="in_time" property="inTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code, type, in_time
     </sql>
 
 </mapper>

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-11-19
+ * @since 2021-12-14
  */
 public interface InStockInfoMapper extends BaseMapper<InStockInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoMapper.xml

@@ -20,11 +20,13 @@
         <result column="location_id" property="locationId" />
         <result column="location_name" property="locationName" />
         <result column="pallet_code" property="palletCode" />
+        <result column="type" property="type" />
+        <result column="in_time" property="inTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code, type, in_time
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/KilnInfoMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 窑炉信息 Mapper 接口
+ * 工业炉信息 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-02-28
  */
 public interface KilnInfoMapper extends BaseMapper<KilnInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml

@@ -27,13 +27,14 @@
         <result column="unit" property="unit" />
         <result column="weight" property="weight" />
         <result column="quantity" property="quantity" />
+        <result column="order_void" property="orderVoid"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
         order_no, old_order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des,
-        craft_ill, unit, weight, quantity
+        craft_ill, unit, weight, quantity, order_void
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml

@@ -31,13 +31,14 @@
         <result column="add_b" property="addB" />
         <result column="orther_a" property="ortherA" />
         <result column="orther_b" property="ortherB" />
+        <result column="order_void" property="orderVoid"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
         order_no, old_order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des,
-        craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b
+        craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b, order_void
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 窑炉电能参数值 Mapper 接口
+ * 工业炉电能参数值 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParEleValueMapper extends BaseMapper<ParEleValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.xml

@@ -9,6 +9,7 @@
         <result column="inter_code" property="interCode" />
         <result column="status" property="status" />
         <result column="kiln_id" property="kilnId" />
+        <result column="task_id" property="taskId" />
         <result column="par_id" property="parId" />
         <result column="a_voltagev_value" property="aVoltagevValue" />
         <result column="b_voltagev_value" property="bVoltagevValue" />
@@ -17,7 +18,7 @@
         <result column="b_current_value" property="bCurrentValue" />
         <result column="c_current_value" property="cCurrentValue" />
         <result column="total_bat" property="totalBat" />
-        <result column="add_a" property="addA" />
+        <result column="date_type" property="dateType" />
         <result column="add_b" property="addB" />
         <result column="add_c" property="addC" />
         <result column="orther_a" property="ortherA" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_time, inter_code, status, kiln_id, par_id, a_voltagev_value, b_voltagev_value, c_voltagev_value, a_current_value, b_current_value, c_current_value, total_bat, add_a, add_b, add_c, orther_a, orther_b, orther_c
+        id, create_time, inter_code, status, kiln_id, task_id, par_id, a_voltagev_value, b_voltagev_value, c_voltagev_value, a_current_value, b_current_value, c_current_value, total_bat, date_type, add_b, add_c, orther_a, orther_b, orther_c
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 窑炉使用气检测值 Mapper 接口
+ * 工业炉使用气检测值 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParGasValueMapper extends BaseMapper<ParGasValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.xml

@@ -9,6 +9,7 @@
         <result column="inter_code" property="interCode" />
         <result column="status" property="status" />
         <result column="kiln_id" property="kilnId" />
+        <result column="task_id" property="taskId" />
         <result column="par_id" property="parId" />
         <result column="set_nit_pot_value" property="setNitPotValue" />
         <result column="actual_nit_pot_value" property="actualNitPotValue" />
@@ -16,17 +17,17 @@
         <result column="nit_flow_value" property="nitFlowValue" />
         <result column="ammonia_flow_value" property="ammoniaFlowValue" />
         <result column="car_dioxide_flow_value" property="carDioxideFlowValue" />
-        <result column="add_a" property="addA" />
-        <result column="add_b" property="addB" />
-        <result column="add_c" property="addC" />
-        <result column="orther_a" property="ortherA" />
+        <result column="methanol_flow" property="methanolFlow" />
+        <result column="propane_flow" property="propaneFlow" />
+        <result column="hydrogen_content" property="hydrogenContent" />
+        <result column="decomposition_rate" property="decompositionRate" />
         <result column="orther_b" property="ortherB" />
         <result column="orther_c" property="ortherC" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_time, inter_code, status, kiln_id, par_id, set_nit_pot_value, actual_nit_pot_value, accept_nit_pot_value, nit_flow_value, ammonia_flow_value, car_dioxide_flow_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
+        id, create_time, inter_code, status, kiln_id, task_id, par_id, set_nit_pot_value, actual_nit_pot_value, accept_nit_pot_value, nit_flow_value, ammonia_flow_value, car_dioxide_flow_value, methanol_flow, propane_flow, hydrogen_content, decomposition_rate, orther_b, orther_c
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 窑炉运转速度 Mapper 接口
+ * 工业炉运转速度 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParRotSpeedValueMapper extends BaseMapper<ParRotSpeedValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.xml

@@ -9,6 +9,7 @@
         <result column="inter_code" property="interCode" />
         <result column="status" property="status" />
         <result column="kiln_id" property="kilnId" />
+        <result column="task_id" property="taskId" />
         <result column="par_id" property="parId" />
         <result column="fan_speed_a_value" property="fanSpeedAValue" />
         <result column="fan_speed_b_value" property="fanSpeedBValue" />
@@ -28,7 +29,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_time, inter_code, status, kiln_id, par_id, fan_speed_a_value, fan_speed_b_value, oil_sti_speed_a_value, oil_sti_speed_b_value, oil_sti_speed_c_value, oil_sti_speed_d_value, oil_sti_speed_e_value, oil_sti_speed_f_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
+        id, create_time, inter_code, status, kiln_id, task_id, par_id, fan_speed_a_value, fan_speed_b_value, oil_sti_speed_a_value, oil_sti_speed_b_value, oil_sti_speed_c_value, oil_sti_speed_d_value, oil_sti_speed_e_value, oil_sti_speed_f_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 窑炉温度监控 Mapper 接口
+ * 工业炉温度监控 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParTemValueMapper extends BaseMapper<ParTemValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.xml

@@ -9,6 +9,7 @@
         <result column="inter_code" property="interCode" />
         <result column="status" property="status" />
         <result column="kiln_id" property="kilnId" />
+        <result column="task_id" property="taskId" />
         <result column="par_id" property="parId" />
         <result column="set_tem_value" property="setTemValue" />
         <result column="act_tem_value" property="actTemValue" />
@@ -16,9 +17,9 @@
         <result column="oil_tank_set_tem_value" property="oilTankSetTemValue" />
         <result column="take_over_set_tem_value" property="takeOverSetTemValue" />
         <result column="take_over_oil_set_tem_value" property="takeOverOilSetTemValue" />
-        <result column="add_a" property="addA" />
-        <result column="add_b" property="addB" />
-        <result column="add_c" property="addC" />
+        <result column="outer_zone1_temp" property="outerZone1Temp" />
+        <result column="outer_zone2_temp" property="outerZone2Temp" />
+        <result column="furnace_pressure" property="furnacePressure" />
         <result column="orther_a" property="ortherA" />
         <result column="orther_b" property="ortherB" />
         <result column="orther_c" property="ortherC" />
@@ -26,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_time, inter_code, status, kiln_id, par_id, set_tem_value, act_tem_value, oil_tank_act_tem_value, oil_tank_set_tem_value, take_over_set_tem_value, take_over_oil_set_tem_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
+        id, create_time, inter_code, status, kiln_id, task_id, par_id, set_tem_value, act_tem_value, oil_tank_act_tem_value, oil_tank_set_tem_value, take_over_set_tem_value, take_over_oil_set_tem_value, outer_zone1_temp, outer_zone2_temp, furnace_pressure, orther_a, orther_b, orther_c
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PlcNameSpaceMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.PlcNameSpace;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * PLC变量nameSpace对照表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2022-02-28
+ */
+public interface PlcNameSpaceMapper extends BaseMapper<PlcNameSpace> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PlcNameSpaceMapper.xml

@@ -0,0 +1,22 @@
+<?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.PlcNameSpaceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.PlcNameSpace">
+        <result column="id" property="id" />
+        <result column="eq_type" property="eqType" />
+        <result column="name" property="name" />
+        <result column="note" property="note" />
+        <result column="eq_id" property="eqId" />
+        <result column="eq_name" property="eqName" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, eq_type, name, note, eq_id, eq_name, type, remark
+    </sql>
+
+</mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PointInfoMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.PointInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 点位信息表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-02
+ */
+public interface PointInfoMapper extends BaseMapper<PointInfo> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PointInfoMapper.xml

@@ -0,0 +1,21 @@
+<?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.PointInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.PointInfo">
+        <result column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="note" property="note" />
+        <result column="type" property="type" />
+        <result column="distance" property="distance" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, code, name, note, type, distance, create_time
+    </sql>
+
+</mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/QuestionAnswerMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.QuestionAnswer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 问题解答表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2022-08-11
+ */
+public interface QuestionAnswerMapper extends BaseMapper<QuestionAnswer> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/QuestionAnswerMapper.xml

@@ -0,0 +1,28 @@
+<?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.QuestionAnswerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.QuestionAnswer">
+        <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="status" property="status" />
+        <result column="inter_code" property="interCode" />
+        <result column="code" property="code" />
+        <result column="question" property="question" />
+        <result column="answer" property="answer" />
+        <result column="description" property="description" />
+        <result column="note" property="note" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, question, answer, description, note
+    </sql>
+
+</mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/RunTaskMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2021-12-14
  */
 public interface RunTaskMapper extends BaseMapper<RunTask> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/RunTaskMapper.xml

@@ -12,14 +12,18 @@
         <result column="update_time" property="updateTime" />
         <result column="version" property="version" />
         <result column="task_id" property="taskId" />
+        <result column="task_code" property="taskCode" />
         <result column="start_position" property="startPosition" />
         <result column="end_position" property="endPosition" />
+        <result column="vehicle_id" property="vehicleId" />
+        <result column="begin_time" property="beginTime" />
+        <result column="end_time" property="endTime" />
         <result column="status" property="status" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, task_id, start_position, end_position, status
+        id, valid, create_time, creator_id, updater_id, update_time, version, task_id, task_code, start_position, end_position, vehicle_id, begin_time, end_time, status
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.xml

@@ -14,7 +14,7 @@
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
         <result column="task_code" property="taskCode" />
-        <result column="task_id" property="taskId" />
+        <result column="curr_task_id" property="currTaskId" />
         <result column="order_no" property="orderNo" />
         <result column="iden_card_num" property="idenCardNum" />
         <result column="product_name" property="productName" />
@@ -27,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, order_no, iden_card_num, product_name, material_des, craft_ill, unit, weight, quantity
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, curr_task_id, order_no, iden_card_num, product_name, material_des, craft_ill, unit, weight, quantity
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 任务历史 Mapper 接口
+ * 任务历史表 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-08-01
  */
 public interface TaskHisMapper extends BaseMapper<TaskHis> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml

@@ -13,31 +13,37 @@
         <result column="version" property="version" />
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
+        <result column="is_auto" property="isAuto" />
+        <result column="auto_exe_task_id" property="autoExeTaskId" />
+        <result column="kiln_id" property="kilnId" />
+        <result column="kiln_name" property="kilnName" />
+        <result column="craft_code_id" property="craftCodeId" />
+        <result column="plc_value" property="plcValue" />
+        <result column="begin_time" property="beginTime" />
+        <result column="end_time" property="endTime" />
+        <result column="is_in" property="isIn" />
+        <result column="run_task_id" property="runTaskId" />
+        <result column="start_position" property="startPosition" />
+        <result column="target_position" property="targetPosition" />
+        <result column="is_cache" property="isCache" />
+        <result column="cache_satatus" property="cacheSatatus" />
+        <result column="cache_run_task_id" property="cacheRunTaskId" />
+        <result column="location_id" property="locationId" />
+        <result column="location_name" property="locationName" />
+        <result column="is_out" property="isOut" />
+        <result column="out_run_task_id" property="outRunTaskId" />
+        <result column="out_start_position" property="outStartPosition" />
+        <result column="out_target_position" property="outTargetPosition" />
         <result column="task_code" property="taskCode" />
-        <result column="sheet_no" property="sheetNo"/>
-        <result column="task_source" property="taskSource" />
-        <result column="task_type" property="taskType" />
         <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"/>
-        <result column="start_position" property="startPosition"/>
-        <result column="target_position" property="targetPosition"/>
-        <result column="kiln_id" property="kilnId"/>
-        <result column="kiln_name" property="kilnName"/>
-        <result column="vehicle_id" property="vehicleId"/>
-        <result column="is_cache" property="isCache"/>
-        <result column="location_id" property="locationId"/>
-        <result column="location_name" property="locationName"/>
-        <result column="f_craft_code_id" property="fCraftCodeId"/>
-        <result column="f_plc_value" property="fPlcValue"/>
+        <result column="task_type" property="taskType" />
+        <result column="sheet_no" property="sheetNo" />
+        <result column="task_id" property="taskId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no,
-        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, f_craft_code_id, f_plc_value
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, is_auto, auto_exe_task_id, kiln_id, kiln_name, craft_code_id, plc_value, begin_time, end_time, is_in, run_task_id, start_position, target_position, is_cache, cache_satatus, cache_run_task_id, location_id, location_name, is_out, out_run_task_id, out_start_position, out_target_position, task_code, process_type, task_type, sheet_no, task_id
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/WarehouseMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-10
  */
 public interface WarehouseMapper extends BaseMapper<Warehouse> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/WarehouseMapper.xml

@@ -19,11 +19,14 @@
         <result column="spec" property="spec" />
         <result column="description" property="description" />
         <result column="note" property="note" />
+        <result column="english_name" property="englishName" />
+        <result column="alias_name" property="aliasName" />
+        <result column="number" property="number" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, factory_id, warehouse_name, spec, description, note
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, factory_id, warehouse_name, spec, description, note, english_name, alias_name, number
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AlarmInfoServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-02-28
  */
 public interface AlarmInfoServiceBiz extends IService<AlarmInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java

@@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2022-01-05
  */
 public interface ApmsCheckResultServiceBiz extends IService<ApmsCheckResult> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AutoExeTaskHisServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.AutoExeTaskHis;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 自动执行任务表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-14
+ */
+public interface AutoExeTaskHisServiceBiz extends IService<AutoExeTaskHis> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AutoExeTaskServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.AutoExeTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 自动执行任务表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-04
+ */
+public interface AutoExeTaskServiceBiz extends IService<AutoExeTask> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskDetServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 public interface CurrTaskDetServiceBiz extends IService<CurrTaskDet> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 当前任务 服务类
+ * 任务表 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 public interface CurrTaskServiceBiz extends IService<CurrTask> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/InStockInfoHisServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 缓存表存储历史情况 服务类
+ * 缓存区存储历史情况 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-14
  */
 public interface InStockInfoHisServiceBiz extends IService<InStockInfoHis> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/InStockInfoServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2021-12-14
  */
 public interface InStockInfoServiceBiz extends IService<InStockInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/KilnInfoServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 窑炉信息 服务类
+ * 工业炉信息 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-02-28
  */
 public interface KilnInfoServiceBiz extends IService<KilnInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParEleValueServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 窑炉电能参数值 服务类
+ * 工业炉电能参数值 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParEleValueServiceBiz extends IService<ParEleValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParGasValueServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 窑炉使用气检测值 服务类
+ * 工业炉使用气检测值 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParGasValueServiceBiz extends IService<ParGasValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParRotSpeedValueServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 窑炉运转速度 服务类
+ * 工业炉运转速度 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParRotSpeedValueServiceBiz extends IService<ParRotSpeedValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParTemValueServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 窑炉温度监控 服务类
+ * 工业炉温度监控 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2022-03-01
  */
 public interface ParTemValueServiceBiz extends IService<ParTemValue> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/PlcNameSpaceServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.PlcNameSpace;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * PLC变量nameSpace对照表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2022-02-28
+ */
+public interface PlcNameSpaceServiceBiz extends IService<PlcNameSpace> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/PointInfoServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.PointInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 点位信息表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2022-03-02
+ */
+public interface PointInfoServiceBiz extends IService<PointInfo> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/QuestionAnswerServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.QuestionAnswer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 问题解答表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2022-08-11
+ */
+public interface QuestionAnswerServiceBiz extends IService<QuestionAnswer> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/RunTaskServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-11-19
+ * @since 2021-12-14
  */
 public interface RunTaskServiceBiz extends IService<RunTask> {