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

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

@@ -0,0 +1,137 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+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
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_craft_info")
+public class CraftInfo extends Model<CraftInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用，2停止
+     */
+    @TableField("valid")
+    @TableLogic
+    private Integer valid;
+
+    /**
+     * 添加时间，入库时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater_id")
+    private Integer updaterId;
+
+    /**
+     * 修改时间，更具修改时间来判断下次执行顺序，第一次修改时间和新增时间相同
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 版本号 默认为 1
+     */
+    @TableField("version")
+    @Version
+    private String version;
+
+    /**
+     * 状态，0：可用，1：不可用
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 内部编码，系统自动生成
+     */
+    @TableField("inter_code")
+    private String interCode;
+
+    /**
+     * 工艺号
+     */
+    @TableField("craft_code")
+    private String craftCode;
+
+    /**
+     * 编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 对应PLC值
+     */
+    @TableField("plc_value")
+    private Integer plcValue;
+
+    /**
+     * 说明
+     */
+    @TableField("content")
+    private String content;
+
+
+    public static final String ID = "id";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String STATUS = "status";
+
+    public static final String INTER_CODE = "inter_code";
+
+    public static final String CRAFT_CODE = "craft_code";
+
+    public static final String CODE = "code";
+
+    public static final String PLC_VALUE = "plc_value";
+
+    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

@@ -1,25 +1,21 @@
 package com.mt.wms.core.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 当前任务
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -88,6 +84,12 @@ public class CurrTask extends Model<CurrTask> {
     @TableField("task_code")
     private String taskCode;
 
+    /**
+     * 生产单号 APMS生成生产单后返回
+     */
+    @TableField("sheet_no")
+    private String sheetNo;
+
     /**
      * 任务来源  0：人工 扩展字段
      */
@@ -172,6 +174,18 @@ public class CurrTask extends Model<CurrTask> {
     @TableField("location_name")
     private String locationName;
 
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("f_craft_code_id")
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
+
 
     public static final String ID = "id";
 
@@ -193,6 +207,8 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String TASK_CODE = "task_code";
 
+    public static final String SHEET_NO = "sheet_no";
+
     public static final String TASK_SOURCE = "task_source";
 
     public static final String TASK_TYPE = "task_type";
@@ -221,6 +237,10 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String LOCATION_NAME = "location_name";
 
+    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+
+    public static final String F_PLC_VALUE = "f_plc_value";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -1,25 +1,21 @@
 package com.mt.wms.core.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单任务表
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -100,6 +96,12 @@ public class OrderInfo extends Model<OrderInfo> {
     @TableField("order_no")
     private String orderNo;
 
+    /**
+     * 原订单号，APMS系统获取 返单时才存在
+     */
+    @TableField("old_order_no")
+    private String oldOrderNo;
+
     /**
      * 标识卡号，APMS系统获取
      */
@@ -209,6 +211,8 @@ public class OrderInfo extends Model<OrderInfo> {
 
     public static final String ORDER_NO = "order_no";
 
+    public static final String OLD_ORDER_NO = "old_order_no";
+
     public static final String IDEN_CARD_NUM = "iden_card_num";
 
     public static final String CUSTOMER_NO = "customer_no";

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

@@ -1,25 +1,21 @@
 package com.mt.wms.core.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单任务历史表
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -100,6 +96,12 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
     @TableField("order_no")
     private String orderNo;
 
+    /**
+     * 原订单号，APMS系统获取，返工单才存在
+     */
+    @TableField("old_order_no")
+    private String oldOrderNo;
+
     /**
      * 标识卡号，APMS系统获取
      */
@@ -185,6 +187,8 @@ public class OrderInfoHis extends Model<OrderInfoHis> {
 
     public static final String ORDER_NO = "order_no";
 
+    public static final String OLD_ORDER_NO = "old_order_no";
+
     public static final String IDEN_CARD_NUM = "iden_card_num";
 
     public static final String CUSTOMER_NO = "customer_no";

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

@@ -1,25 +1,21 @@
 package com.mt.wms.core.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 任务历史
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -88,6 +84,12 @@ public class TaskHis extends Model<TaskHis> {
     @TableField("task_code")
     private String taskCode;
 
+    /**
+     * 生产单号 APMS生成生产单后返回
+     */
+    @TableField("sheet_no")
+    private String sheetNo;
+
     /**
      * 任务来源  0：人工 扩展字段
      */
@@ -172,6 +174,18 @@ public class TaskHis extends Model<TaskHis> {
     @TableField("location_name")
     private String locationName;
 
+    /**
+     * 工艺号ID，关联工艺号表：t_craft_info
+     */
+    @TableField("f_craft_code_id")
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
+
 
     public static final String ID = "id";
 
@@ -193,6 +207,8 @@ public class TaskHis extends Model<TaskHis> {
 
     public static final String TASK_CODE = "task_code";
 
+    public static final String SHEET_NO = "sheet_no";
+
     public static final String TASK_SOURCE = "task_source";
 
     public static final String TASK_TYPE = "task_type";
@@ -221,6 +237,10 @@ public class TaskHis extends Model<TaskHis> {
 
     public static final String LOCATION_NAME = "location_name";
 
+    public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
+
+    public static final String F_PLC_VALUE = "f_plc_value";
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mt.wms.core.dal.entity.CraftInfo;
+
+/**
+ * <p>
+ * 设备工艺信息 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-09
+ */
+public interface CraftInfoMapper extends BaseMapper<CraftInfo> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CraftInfoMapper.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.CraftInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.CraftInfo">
+        <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="craft_code" property="craftCode"/>
+        <result column="code" property="code"/>
+        <result column="plc_value" property="plcValue"/>
+        <result column="content" property="content"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, craft_code, code,
+        plc_value, content
+    </sql>
+
+</mapper>

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

@@ -14,25 +14,30 @@
         <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_cache" property="isCache" />
-        <result column="location_id" property="locationId" />
-        <result column="location_name" property="locationName" />
+        <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"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_source, task_type, process_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, 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
     </sql>
 
 </mapper>

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

@@ -16,6 +16,7 @@
         <result column="inter_code" property="interCode" />
         <result column="code" property="code" />
         <result column="order_no" property="orderNo" />
+        <result column="old_order_no" property="oldOrderNo"/>
         <result column="iden_card_num" property="idenCardNum" />
         <result column="customer_no" property="customerNo" />
         <result column="customer_name" property="customerName" />
@@ -30,7 +31,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code, order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit, weight, quantity
+        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code,
+        order_no, old_order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des,
+        craft_ill, unit, weight, quantity
     </sql>
 
 </mapper>

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

@@ -16,6 +16,7 @@
         <result column="inter_code" property="interCode" />
         <result column="code" property="code" />
         <result column="order_no" property="orderNo" />
+        <result column="old_order_no" property="oldOrderNo"/>
         <result column="iden_card_num" property="idenCardNum" />
         <result column="customer_no" property="customerNo" />
         <result column="customer_name" property="customerName" />
@@ -34,7 +35,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code, order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b
+        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
     </sql>
 
 </mapper>

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

@@ -14,25 +14,30 @@
         <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_cache" property="isCache" />
-        <result column="location_id" property="locationId" />
-        <result column="location_name" property="locationName" />
+        <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"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_source, task_type, process_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, 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
     </sql>
 
 </mapper>

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

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mt.wms.core.dal.entity.CraftInfo;
+
+/**
+ * <p>
+ * 设备工艺信息 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-09
+ */
+public interface CraftInfoServiceBiz extends IService<CraftInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.mt.wms.core.dal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mt.wms.core.dal.entity.CraftInfo;
+import com.mt.wms.core.dal.mapper.CraftInfoMapper;
+import com.mt.wms.core.dal.service.CraftInfoServiceBiz;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备工艺信息 服务实现类
+ * </p>
+ *
+ * @author mt
+ * @since 2021-12-09
+ */
+@Service
+public class CraftInfoServiceBizImpl extends ServiceImpl<CraftInfoMapper, CraftInfo> implements CraftInfoServiceBiz {
+
+}