From f947208003e8e2238aeff3a9a2c7ecd233147d6f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Fri, 12 Jul 2024 17:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/app/dto/extend/KanbanEntity.java | 11 ++ .../com/wms/entity/table/ELocationConfig.java | 33 ++++++ .../com/wms/entity/table/ETagLocation.java | 5 + src/main/java/com/wms/entity/table/Goods.java | 101 +++++++++++++++--- .../com/wms/entity/table/GoodsToStation.java | 44 ++++++++ .../com/wms/entity/table/OutsideVehicles.java | 24 +++++ .../java/com/wms/entity/table/PickTask.java | 5 + .../java/com/wms/entity/table/WorkFlow.java | 44 +++++++- .../com/wms/entity/table/WorkSummary.java | 82 ++++++++++++++ 9 files changed, 335 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/wms/entity/app/dto/extend/KanbanEntity.java create mode 100644 src/main/java/com/wms/entity/table/ELocationConfig.java create mode 100644 src/main/java/com/wms/entity/table/GoodsToStation.java create mode 100644 src/main/java/com/wms/entity/table/WorkSummary.java diff --git a/src/main/java/com/wms/entity/app/dto/extend/KanbanEntity.java b/src/main/java/com/wms/entity/app/dto/extend/KanbanEntity.java new file mode 100644 index 0000000..1801199 --- /dev/null +++ b/src/main/java/com/wms/entity/app/dto/extend/KanbanEntity.java @@ -0,0 +1,11 @@ +package com.wms.entity.app.dto.extend; + +import lombok.Data; + +@Data +public class KanbanEntity { + /** + * 看板id + */ + private String kanbanId; +} diff --git a/src/main/java/com/wms/entity/table/ELocationConfig.java b/src/main/java/com/wms/entity/table/ELocationConfig.java new file mode 100644 index 0000000..17f814a --- /dev/null +++ b/src/main/java/com/wms/entity/table/ELocationConfig.java @@ -0,0 +1,33 @@ +package com.wms.entity.table; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 电子标签库位对应工单工位盒子 + */ +@Data +@TableName(value = "tbl_app_e_location_config", autoResultMap = true) +public class ELocationConfig { + /** + * 工站 + */ + @TableField("work_station") + private String workStation; + /** + * 工单 + */ + @TableField("work_order") + private String workOrder; + /** + * 工位 + */ + @TableField("work_center") + private String workCenter; + /** + * 电子标签库位 + */ + @TableField("e_location_id") + private String eLocationId; +} diff --git a/src/main/java/com/wms/entity/table/ETagLocation.java b/src/main/java/com/wms/entity/table/ETagLocation.java index ffb64ba..2f385c3 100644 --- a/src/main/java/com/wms/entity/table/ETagLocation.java +++ b/src/main/java/com/wms/entity/table/ETagLocation.java @@ -33,6 +33,11 @@ public class ETagLocation { */ @TableField("e_location_status") private Integer eLocationStatus; + /** + * 工作站台 + */ + @TableField("work_station") + private String workStation; /** * 工单工位盒子号 */ diff --git a/src/main/java/com/wms/entity/table/Goods.java b/src/main/java/com/wms/entity/table/Goods.java index e01ec68..51b9e0b 100644 --- a/src/main/java/com/wms/entity/table/Goods.java +++ b/src/main/java/com/wms/entity/table/Goods.java @@ -3,9 +3,13 @@ package com.wms.entity.table; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler; +import com.wms.entity.app.dto.extend.KanbanEntity; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 物料 @@ -13,14 +17,13 @@ import java.util.Date; @Data @TableName(value = "tbl_app_goods", autoResultMap = true) public class Goods { - // TODO 物料详细信息根据卡特方提供的信息来完善 /** * 物料编号 */ @TableId("goods_id") private String goodsId; /** - * 物料名称 + * 物料名称/描述 */ @TableField("goods_name") private String goodsName; @@ -29,26 +32,98 @@ public class Goods { */ @TableField("goods_unit") private String goodsUnit; - /** - * 物料ID - */ - @TableField("item_id") - private String itemId; /** * 物料分类 */ @TableField("goods_type") private String goodsType; /** - * 有效天数 + * 供应商分类 */ - @TableField("life_days") - private Integer lifeDays; + @TableField("provider_type") + private String providerType; /** - * 仓储分类 + * 重量 */ - @TableField("inv_category") - private String invCategory; + @TableField("weight") + private BigDecimal weight; + /** + * 重量单位 + */ + @TableField("weight_unit") + private String weightUnit; + /** + * 每盒数量 + */ + @TableField("quantity_per_box") + private BigDecimal quantityPerBox; + /** + * 拆包方式 + */ + @TableField("") + private String unpackingType; + /** + * 载具类型 + */ + @TableField("") + private String vehicleType; + /** + * 载具类型描述 + */ + @TableField("") + private String vehicleTypeDescription; + /** + * 物料载具类型 + */ + @TableField("") + private String goodsInVehicleType; + /** + * 补料方式 + * PULL：有看板 + * PUSH：无看板 + */ + @TableField("") + private String feedingType; + /** + * 每个看板包含物料数量 + */ + @TableField("") + private BigDecimal quantityPerKanban; + /** + * 看板的数量 + */ + @TableField("") + private Integer kanbanNum; + /** + * 看板详细信息 + */ + @TableField(value = "goods_related", typeHandler = Fastjson2TypeHandler.class) + private List kanbanList; + /** + * 补货点 + */ + @TableField("") + private BigDecimal feedingValue; + /** + * 备注1 + */ + @TableField("") + private String remark1; + /** + * 备注2 + */ + @TableField("") + private String remark2; + /** + * 备注3 + */ + @TableField("") + private String remark3; + /** + * 数据来源 + */ + @TableField("") + private String dataSource; /** * 最后更新日期 */ diff --git a/src/main/java/com/wms/entity/table/GoodsToStation.java b/src/main/java/com/wms/entity/table/GoodsToStation.java new file mode 100644 index 0000000..f1be554 --- /dev/null +++ b/src/main/java/com/wms/entity/table/GoodsToStation.java @@ -0,0 +1,44 @@ +package com.wms.entity.table; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 每个站台物料分配 + */ +@Data +@TableName(value = "tbl_app_goods_to_station", autoResultMap = true) +public class GoodsToStation { + /** + * 工作站台 + */ + @TableField("work_station") + private String workStation; + /** + * 物料编号 + */ + @TableField("goods_id") + private String goodsId; + /** + * 已分配数量 + */ + @TableField("distributed_num") + private BigDecimal distributedNum; + /** + * 需求总数量 + */ + @TableField("total_num") + private BigDecimal totalNum; + /** + * 分配状态 + * 0：未分配 + * 1：分配但未完全分配 + * 2：分配完成 + * 3：分配完成但库存缺料 + */ + @TableField("distribute_status") + private Integer distributeStatus; +} diff --git a/src/main/java/com/wms/entity/table/OutsideVehicles.java b/src/main/java/com/wms/entity/table/OutsideVehicles.java index fe9556d..fc7829e 100644 --- a/src/main/java/com/wms/entity/table/OutsideVehicles.java +++ b/src/main/java/com/wms/entity/table/OutsideVehicles.java @@ -1,6 +1,30 @@ package com.wms.entity.table; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 当前出库中的载具和物料 + */ +@Data +@TableName(value = "tbl_app_outside_vehicles") public class OutsideVehicles { + /** + * 载具号 + */ + @TableField("vehicle_id") private String vehicleId; + /** + * 物料编号 + */ + @TableField("goods_id") private String goodsId; + /** + * 剩余数量 + */ + @TableField("remain_num") + private BigDecimal remainNum; } diff --git a/src/main/java/com/wms/entity/table/PickTask.java b/src/main/java/com/wms/entity/table/PickTask.java index bccb107..adeff81 100644 --- a/src/main/java/com/wms/entity/table/PickTask.java +++ b/src/main/java/com/wms/entity/table/PickTask.java @@ -1,5 +1,6 @@ package com.wms.entity.table; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,10 +21,12 @@ public class PickTask { /** * 载具号 */ + @TableField("vehicle_id") private String vehicleId; /** * 站台号 */ + @TableField("stand_id") private String standId; /** * 拣选任务状态 @@ -32,9 +35,11 @@ public class PickTask { * 1：已发送 * 2：已完成 */ + @TableField("pick_status") private Integer pickStatus; /** * 最近更新时间 */ + @TableField("last_update_time") private LocalDateTime lastUpdateTime; } diff --git a/src/main/java/com/wms/entity/table/WorkFlow.java b/src/main/java/com/wms/entity/table/WorkFlow.java index e5bb541..7b07ad9 100644 --- a/src/main/java/com/wms/entity/table/WorkFlow.java +++ b/src/main/java/com/wms/entity/table/WorkFlow.java @@ -1,25 +1,67 @@ package com.wms.entity.table; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; + /** * 工作站台-工单-工位的工作流 */ +@Data +@TableName(value = "tbl_app_work_flow", autoResultMap = true) public class WorkFlow { /** * id */ + @TableId("work_flow_id") private String workFlowId; /** * 工作站台 */ + @TableField("work_station") private String workStation; /** * 工单 */ + @TableField("work_order") private String workOrder; /** * 工位 */ + @TableField("work_center") private String workCenter; + /** + * 物料编号 + */ + @TableField("goods_id") private String goodsId; - + /** + * 已拣货数量 + */ + @TableField("picked_num") + private BigDecimal pickedNum; + /** + * 需求数量 + */ + @TableField("need_num") + private BigDecimal needNum; + /** + * 亮灯状态 + * 0：未亮灯 + * 1：已亮灯 + * 2：已拍灯 + */ + @TableField("light_status") + private Integer lightStatus; + /** + * 工作状态 + * 0：未开始 + * 1：正在做 + * 2：已完成 + */ + @TableField("work_status") + private Integer workStatus; } diff --git a/src/main/java/com/wms/entity/table/WorkSummary.java b/src/main/java/com/wms/entity/table/WorkSummary.java new file mode 100644 index 0000000..0790d74 --- /dev/null +++ b/src/main/java/com/wms/entity/table/WorkSummary.java @@ -0,0 +1,82 @@ +package com.wms.entity.table; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 工作总结 + */ +@Data +@TableName(value = "tbl_app_work_summary", autoResultMap = true) +public class WorkSummary { + /** + * id + */ + @TableId("work_flow_id") + private String workFlowId; + /** + * 工作站台 + */ + @TableField("work_station") + private String workStation; + /** + * 工单 + */ + @TableField("work_order") + private String workOrder; + /** + * 工位 + */ + @TableField("work_center") + private String workCenter; + /** + * 物料编号 + */ + @TableField("goods_id") + private String goodsId; + /** + * 已拣货数量 + */ + @TableField("picked_num") + private BigDecimal pickedNum; + /** + * 需求数量 + */ + @TableField("need_num") + private BigDecimal needNum; + /** + * 缺件数量 + */ + @TableField("lack_num") + private BigDecimal lackNum; + /** + * 工作日期 + */ + @TableField("work_date") + private LocalDateTime workDate; + /** + * 工作状态 + * 0：未开始 + * 1：正在做 + * 2：已完成 + */ + @TableField("work_status") + private Integer workStatus; + /** + * 缺件状态 + * 0：不缺件 + * 1：缺件 + */ + @TableField("lack_status") + private Integer lackStatus; + /** + * 完成时间 + */ + @TableField("finish_time") + private LocalDateTime finishTime; +}