From db04b8348157bc8f27d74a027c89b2b0b9cc87b7 Mon Sep 17 00:00:00 2001 From: Lin-XCC <754310653@QQ.COM> Date: Thu, 9 Dec 2021 16:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=8C=BA=E5=88=86=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mt/wms/core/dal/entity/CurrTask.java | 18 +++++++++---- .../com/mt/wms/core/dal/entity/OrderInfo.java | 22 +++++++++------- .../mt/wms/core/dal/entity/OrderInfoHis.java | 22 +++++++++------- .../com/mt/wms/core/dal/entity/TaskHis.java | 18 +++++++++---- .../mt/wms/core/dal/mapper/CurrTaskMapper.xml | 25 ++++++++++--------- .../core/dal/mapper/OrderInfoHisMapper.xml | 5 +++- .../wms/core/dal/mapper/OrderInfoMapper.xml | 5 +++- .../mt/wms/core/dal/mapper/TaskHisMapper.xml | 25 ++++++++++--------- 8 files changed, 86 insertions(+), 54 deletions(-) diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java index 9b70e65..a2c413a 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; *

* * @author mt - * @since 2021-12-08 + * @since 2021-12-09 */ @Data @EqualsAndHashCode(callSuper = false) @@ -175,10 +175,16 @@ public class CurrTask extends Model { private String locationName; /** - * 窑炉工艺号 + * 工艺号ID，关联工艺号表：t_craft_info */ - @TableField("craft_code") - private String craftCode; + @TableField("f_craft_code_id") + 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 { 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() { diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java index e561ad4..1636215 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java @@ -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; + /** *

* 订单任务表 *

* * @author mt - * @since 2021-11-18 + * @since 2021-12-09 */ @Data @EqualsAndHashCode(callSuper = false) @@ -100,6 +96,12 @@ public class OrderInfo extends Model { @TableField("order_no") private String orderNo; + /** + * 原订单号，APMS系统获取 返单时才存在 + */ + @TableField("old_order_no") + private String oldOrderNo; + /** * 标识卡号，APMS系统获取 */ @@ -209,6 +211,8 @@ public class OrderInfo extends Model { 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"; diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java index f09911a..4c599ec 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfoHis.java @@ -1,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; + /** *

* 订单任务历史表 *

* * @author mt - * @since 2021-11-18 + * @since 2021-12-09 */ @Data @EqualsAndHashCode(callSuper = false) @@ -100,6 +96,12 @@ public class OrderInfoHis extends Model { @TableField("order_no") private String orderNo; + /** + * 原订单号，APMS系统获取，返工单才存在 + */ + @TableField("old_order_no") + private String oldOrderNo; + /** * 标识卡号，APMS系统获取 */ @@ -185,6 +187,8 @@ public class OrderInfoHis extends Model { 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"; diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java index a7149c6..b3d00b9 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; *

* * @author mt - * @since 2021-12-08 + * @since 2021-12-09 */ @Data @EqualsAndHashCode(callSuper = false) @@ -175,10 +175,16 @@ public class TaskHis extends Model { private String locationName; /** - * 窑炉工艺号 + * 工艺号ID，关联工艺号表：t_craft_info */ - @TableField("craft_code") - private String craftCode; + @TableField("f_craft_code_id") + 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 { 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() { diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml index dd75888..375bce2 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml @@ -19,24 +19,25 @@ - - - - - - - - - - - + + + + + + + + + + + + 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 diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml index 0476782..352684c 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoHisMapper.xml @@ -16,6 +16,7 @@ + @@ -30,7 +31,9 @@ - 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 diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml index c1efe7b..1131b73 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -34,7 +35,9 @@ - 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 diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml index 09756ee..d6710d4 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml @@ -19,24 +19,25 @@ - - - - - - - - - - - + + + + + + + + + + + + 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