修改订单以及当前任务的表格，添加任务的工艺信息，订单添加字段区分返工单。

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

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-08
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -175,10 +175,16 @@ public class CurrTask extends Model<CurrTask> {
     private String locationName;
 
     /**
-     * 窑炉工艺号
+     * 工艺号ID，关联工艺号表：t_craft_info
      */
-    @TableField("craft_code")
+    @TableField("f_craft_code_id")
-    private String craftCode;
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
 
 
     public static final String ID = "id";
@@ -231,7 +237,9 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String LOCATION_NAME = "location_name";
 
-    public static final String CRAFT_CODE = "craft_code";
+    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() {

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.*;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单任务表
  * </p>
  *
  * @author mt
- * @since 2021-11-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.*;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单任务历史表
  * </p>
  *
  * @author mt
- * @since 2021-11-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

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author mt
- * @since 2021-12-08
+ * @since 2021-12-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -175,10 +175,16 @@ public class TaskHis extends Model<TaskHis> {
     private String locationName;
 
     /**
-     * 窑炉工艺号
+     * 工艺号ID，关联工艺号表：t_craft_info
      */
-    @TableField("craft_code")
+    @TableField("f_craft_code_id")
-    private String craftCode;
+    private Long fCraftCodeId;
+
+    /**
+     * 工艺号对应PLC值
+     */
+    @TableField("f_plc_value")
+    private Integer fPlcValue;
 
 
     public static final String ID = "id";
@@ -231,7 +237,9 @@ public class TaskHis extends Model<TaskHis> {
 
     public static final String LOCATION_NAME = "location_name";
 
-    public static final String CRAFT_CODE = "craft_code";
+    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() {

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

@@ -29,14 +29,15 @@
         <result column="is_cache" property="isCache"/>
         <result column="location_id" property="locationId"/>
         <result column="location_name" property="locationName"/>
-        <result column="craft_code" property="craftCode"/>
+        <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, 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, craft_code
+        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

@@ -29,14 +29,15 @@
         <result column="is_cache" property="isCache"/>
         <result column="location_id" property="locationId"/>
         <result column="location_name" property="locationName"/>
-        <result column="craft_code" property="craftCode"/>
+        <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, 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, craft_code
+        kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name, f_craft_code_id, f_plc_value
     </sql>
 
 </mapper>