mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
徐晨晨 2021-12-09 16:28:37 +08:00
parent 4abf2d23aa
commit db04b83481
8 changed files with 86 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* </p> * </p>
* *
* @author mt * @author mt
* @since 2021-12-08 * @since 2021-12-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ -175,10 +175,16 @@ public class CurrTask extends Model<CurrTask> {
private String locationName; 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"; 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 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 @Override
protected Serializable pkVal() { protected Serializable pkVal() {

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

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

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

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

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

@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* </p> * </p>
* *
* @author mt * @author mt
* @since 2021-12-08 * @since 2021-12-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ -175,10 +175,16 @@ public class TaskHis extends Model<TaskHis> {
private String locationName; 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"; 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 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 @Override
protected Serializable pkVal() { protected Serializable pkVal() {

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

@ -19,24 +19,25 @@
<result column="task_type" property="taskType" /> <result column="task_type" property="taskType" />
<result column="process_type" property="processType" /> <result column="process_type" property="processType" />
<result column="pallet_code" property="palletCode" /> <result column="pallet_code" property="palletCode" />
<result column="a_begin_time" property="aBeginTime" /> <result column="a_begin_time" property="aBeginTime"/>
<result column="a_end_time" property="aEndTime" /> <result column="a_end_time" property="aEndTime"/>
<result column="start_position" property="startPosition" /> <result column="start_position" property="startPosition"/>
<result column="target_position" property="targetPosition" /> <result column="target_position" property="targetPosition"/>
<result column="kiln_id" property="kilnId" /> <result column="kiln_id" property="kilnId"/>
<result column="kiln_name" property="kilnName" /> <result column="kiln_name" property="kilnName"/>
<result column="vehicle_id" property="vehicleId" /> <result column="vehicle_id" property="vehicleId"/>
<result column="is_cache" property="isCache" /> <result column="is_cache" property="isCache"/>
<result column="location_id" property="locationId" /> <result column="location_id" property="locationId"/>
<result column="location_name" property="locationName" /> <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> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no, 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, 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> </sql>
</mapper> </mapper>

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

@ -16,6 +16,7 @@
<result column="inter_code" property="interCode" /> <result column="inter_code" property="interCode" />
<result column="code" property="code" /> <result column="code" property="code" />
<result column="order_no" property="orderNo" /> <result column="order_no" property="orderNo" />
<result column="old_order_no" property="oldOrderNo"/>
<result column="iden_card_num" property="idenCardNum" /> <result column="iden_card_num" property="idenCardNum" />
<result column="customer_no" property="customerNo" /> <result column="customer_no" property="customerNo" />
<result column="customer_name" property="customerName" /> <result column="customer_name" property="customerName" />
@ -30,7 +31,9 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <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> </sql>
</mapper> </mapper>

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

@ -16,6 +16,7 @@
<result column="inter_code" property="interCode" /> <result column="inter_code" property="interCode" />
<result column="code" property="code" /> <result column="code" property="code" />
<result column="order_no" property="orderNo" /> <result column="order_no" property="orderNo" />
<result column="old_order_no" property="oldOrderNo"/>
<result column="iden_card_num" property="idenCardNum" /> <result column="iden_card_num" property="idenCardNum" />
<result column="customer_no" property="customerNo" /> <result column="customer_no" property="customerNo" />
<result column="customer_name" property="customerName" /> <result column="customer_name" property="customerName" />
@ -34,7 +35,9 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <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> </sql>
</mapper> </mapper>

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

@ -19,24 +19,25 @@
<result column="task_type" property="taskType" /> <result column="task_type" property="taskType" />
<result column="process_type" property="processType" /> <result column="process_type" property="processType" />
<result column="pallet_code" property="palletCode" /> <result column="pallet_code" property="palletCode" />
<result column="a_begin_time" property="aBeginTime" /> <result column="a_begin_time" property="aBeginTime"/>
<result column="a_end_time" property="aEndTime" /> <result column="a_end_time" property="aEndTime"/>
<result column="start_position" property="startPosition" /> <result column="start_position" property="startPosition"/>
<result column="target_position" property="targetPosition" /> <result column="target_position" property="targetPosition"/>
<result column="kiln_id" property="kilnId" /> <result column="kiln_id" property="kilnId"/>
<result column="kiln_name" property="kilnName" /> <result column="kiln_name" property="kilnName"/>
<result column="vehicle_id" property="vehicleId" /> <result column="vehicle_id" property="vehicleId"/>
<result column="is_cache" property="isCache" /> <result column="is_cache" property="isCache"/>
<result column="location_id" property="locationId" /> <result column="location_id" property="locationId"/>
<result column="location_name" property="locationName" /> <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> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no, 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, 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> </sql>
</mapper> </mapper>