diff --git a/src/main/java/com/wms/entity/app/vo/StandPickFinishVo.java b/src/main/java/com/wms/entity/app/vo/StandPickFinishVo.java new file mode 100644 index 0000000..dba4a88 --- /dev/null +++ b/src/main/java/com/wms/entity/app/vo/StandPickFinishVo.java @@ -0,0 +1,45 @@ +package com.wms.entity.app.vo; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class StandPickFinishVo { + /** + * 站台号 + */ + @JsonProperty("standId") + private String standId; + /** + * 提示 + */ + @JsonProperty("tip") + private String tip; + /** + * 备注 + */ + @JsonProperty("remark") + private String remark; + /** + * 计划完成行数 + */ + @JsonProperty("planRows") + private Integer planRows; + /** + * 实际完成行数 + */ + @JsonProperty("actualRows") + private Integer actualRows; + /** + * 计划备料数量 + */ + @JsonProperty("planCounts") + private BigDecimal planCounts; + /** + * 实际备料数量 + */ + @JsonProperty("actualCounts") + private BigDecimal actualCounts; +} diff --git a/src/main/java/com/wms/entity/app/vo/StandPickVo.java b/src/main/java/com/wms/entity/app/vo/StandPickVo.java new file mode 100644 index 0000000..c3172fa --- /dev/null +++ b/src/main/java/com/wms/entity/app/vo/StandPickVo.java @@ -0,0 +1,68 @@ +package com.wms.entity.app.vo; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 站台备料显示信息 + */ +@Data +public class StandPickVo { + /** + * 工作站台 + */ + @JsonProperty("standId") + private String standId; + /** + * 物料编号 + */ + @JsonProperty("goodsId") + private String goodsId; + /** + * 物料单位 + */ + @JsonProperty("goodsUnit") + private String goodsUnit; + /** + * 计划拣选数量 + */ + @JsonProperty("planPickNum") + private BigDecimal planPickNum; + /** + * 实际数量差异 + */ + @JsonProperty("actualDifference") + private BigDecimal actualDifference; + /** + * 备注 + */ + @JsonProperty("remark") + private String remark; + /** + * 已完成行数 + */ + @JsonProperty("finishedRows") + private Integer finishedRows; + /** + * 总行数 + */ + @JsonProperty("totalRows") + private Integer totalRows; + /** + * 已完成数量 + */ + @JsonProperty("finishedCounts") + private BigDecimal finishedCounts; + /** + * 总数量 + */ + @JsonProperty("totalCounts") + private BigDecimal totalCounts; + /** + * 提示 + */ + @JsonProperty("tip") + private String tip; +} diff --git a/src/main/java/com/wms/entity/table/ETagLocation.java b/src/main/java/com/wms/entity/table/ETagLocation.java index 4d6eceb..ffb64ba 100644 --- a/src/main/java/com/wms/entity/table/ETagLocation.java +++ b/src/main/java/com/wms/entity/table/ETagLocation.java @@ -14,22 +14,43 @@ import java.math.BigDecimal; @TableName(value = "tbl_app_e_location", autoResultMap = true) public class ETagLocation { /** - * + * 库位id */ @TableId("e_location_id") private String eLocationId; + /** + * 库区id + */ @TableField("area_id") private String areaId; + /** + * 顺序号 + */ @TableField("sequence_id") private Integer sequenceId; + /** + * 电子标签状态 + */ @TableField("e_location_status") private Integer eLocationStatus; + /** + * 工单工位盒子号 + */ @TableField("order_box_no") private String orderBoxNo; + /** + * 物料编号 + */ @TableField("goods_id") private String goodsId; + /** + * 数量 + */ @TableField("quantity") private BigDecimal quantity; + /** + * 拣货状态 + */ @TableField("pick_status") private Integer pickStatus; } diff --git a/src/main/java/com/wms/entity/table/KateOrders.java b/src/main/java/com/wms/entity/table/KateOrders.java index 8ae7c88..45e576f 100644 --- a/src/main/java/com/wms/entity/table/KateOrders.java +++ b/src/main/java/com/wms/entity/table/KateOrders.java @@ -1,6 +1,8 @@ package com.wms.entity.table; -import com.wms.utils.excel.ExcelImport; +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; @@ -9,17 +11,68 @@ import java.math.BigDecimal; * 工单明细 */ @Data +@TableName(value = "tbl_app_kate_orders", autoResultMap = true) public class KateOrders { + /** + * id + */ + @TableId("order_id") private String orderId; /** - * 工单号---对应excel详情 + * Order */ + @TableField("work_order") private String workOrder; - private String material; - - - - + /** + * Material + */ + @TableField("goods_id") + private String goodsId; + /** + * Item + */ + @TableField("item") + private String item; + /** + * Description + */ + @TableField("description") + private String description; + /** + * SLoc + */ + @TableField("s_loc") + private String sLoc; + /** + * Type + */ + @TableField("type") + private String type; + /** + * Status + */ + @TableField("origin_status") + private String originStatus; + /** + * SupplyArea + */ + @TableField("supply_area") + private String supplyArea; + /** + * SortStrng + */ + @TableField("sort_string") + private String sortString; + /** + * Requirement Qty + */ + @TableField("requirement_quantity") + private BigDecimal requirementQuantity; + /** + * BUn + */ + @TableField("goods_unit") + private String goodsUnit; /** * 工单状态 * 0:未开始 @@ -27,17 +80,21 @@ public class KateOrders { * 2:正在拣选 * 3:拣选完成 */ + @TableField("order_status") private Integer orderStatus; /** * 缺少数量 */ + @TableField("lack_quantity") private BigDecimal lackQuantity; /** * 实际拣选数量 */ + @TableField("picked_quantity") private BigDecimal pickedQuantity; /** * 操作人员 */ + @TableField("user_name") private String userName; } diff --git a/src/main/java/com/wms/entity/table/KateOrdersHistory.java b/src/main/java/com/wms/entity/table/KateOrdersHistory.java index d1d62a2..9b2cc93 100644 --- a/src/main/java/com/wms/entity/table/KateOrdersHistory.java +++ b/src/main/java/com/wms/entity/table/KateOrdersHistory.java @@ -1,7 +1,100 @@ 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_kate_orders_history", autoResultMap = true) public class KateOrdersHistory { + /** + * id + */ + @TableId("order_id") + private String orderId; + /** + * Order + */ + @TableField("work_order") + private String workOrder; + /** + * Material + */ + @TableField("goods_id") + private String goodsId; + /** + * Item + */ + @TableField("item") + private String item; + /** + * Description + */ + @TableField("description") + private String description; + /** + * SLoc + */ + @TableField("s_loc") + private String sLoc; + /** + * Type + */ + @TableField("type") + private String type; + /** + * Status + */ + @TableField("origin_status") + private String originStatus; + /** + * SupplyArea + */ + @TableField("supply_area") + private String supplyArea; + /** + * SortStrng + */ + @TableField("sort_string") + private String sortString; + /** + * Requirement Qty + */ + @TableField("requirement_quantity") + private BigDecimal requirementQuantity; + /** + * BUn + */ + @TableField("goods_unit") + private String goodsUnit; + /** + * 工单状态 + * 0:未开始 + * 1:已呼叫料箱 + * 2:正在拣选 + * 3:拣选完成 + */ + @TableField("order_status") + private Integer orderStatus; + /** + * 缺少数量 + */ + @TableField("lack_quantity") + private BigDecimal lackQuantity; + /** + * 实际拣选数量 + */ + @TableField("picked_quantity") + private BigDecimal pickedQuantity; + /** + * 操作人员 + */ + @TableField("user_name") + private String userName; } diff --git a/src/main/java/com/wms/entity/table/KateOrdersLast.java b/src/main/java/com/wms/entity/table/KateOrdersLast.java index 03b1c98..af0eaca 100644 --- a/src/main/java/com/wms/entity/table/KateOrdersLast.java +++ b/src/main/java/com/wms/entity/table/KateOrdersLast.java @@ -1,8 +1,100 @@ 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_kate_orders_last", autoResultMap = true) public class KateOrdersLast { - + /** + * id + */ + @TableId("order_id") + private String orderId; + /** + * Order + */ + @TableField("work_order") + private String workOrder; + /** + * Material + */ + @TableField("goods_id") + private String goodsId; + /** + * Item + */ + @TableField("item") + private String item; + /** + * Description + */ + @TableField("description") + private String description; + /** + * SLoc + */ + @TableField("s_loc") + private String sLoc; + /** + * Type + */ + @TableField("type") + private String type; + /** + * Status + */ + @TableField("origin_status") + private String originStatus; + /** + * SupplyArea + */ + @TableField("supply_area") + private String supplyArea; + /** + * SortStrng + */ + @TableField("sort_string") + private String sortString; + /** + * Requirement Qty + */ + @TableField("requirement_quantity") + private BigDecimal requirementQuantity; + /** + * BUn + */ + @TableField("goods_unit") + private String goodsUnit; + /** + * 工单状态 + * 0:未开始 + * 1:已呼叫料箱 + * 2:正在拣选 + * 3:拣选完成 + */ + @TableField("order_status") + private Integer orderStatus; + /** + * 缺少数量 + */ + @TableField("lack_quantity") + private BigDecimal lackQuantity; + /** + * 实际拣选数量 + */ + @TableField("picked_quantity") + private BigDecimal pickedQuantity; + /** + * 操作人员 + */ + @TableField("user_name") + private String userName; } diff --git a/src/main/java/com/wms/entity/table/OutsideVehicles.java b/src/main/java/com/wms/entity/table/OutsideVehicles.java new file mode 100644 index 0000000..fe9556d --- /dev/null +++ b/src/main/java/com/wms/entity/table/OutsideVehicles.java @@ -0,0 +1,6 @@ +package com.wms.entity.table; + +public class OutsideVehicles { + private String vehicleId; + private String goodsId; +} diff --git a/src/main/java/com/wms/entity/table/PickTask.java b/src/main/java/com/wms/entity/table/PickTask.java new file mode 100644 index 0000000..bccb107 --- /dev/null +++ b/src/main/java/com/wms/entity/table/PickTask.java @@ -0,0 +1,40 @@ +package com.wms.entity.table; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 站台拣选任务 + */ +@Data +@TableName(value = "tbl_app_pick_task", autoResultMap = true) +public class PickTask { + /** + * 拣选任务号 + */ + @TableId("pick_task_id") + private String pickTaskId; + /** + * 载具号 + */ + private String vehicleId; + /** + * 站台号 + */ + private String standId; + /** + * 拣选任务状态 + * -1:已取消 + * 0:初始化 + * 1:已发送 + * 2:已完成 + */ + private Integer pickStatus; + /** + * 最近更新时间 + */ + private LocalDateTime lastUpdateTime; +} diff --git a/src/main/java/com/wms/entity/table/PickTaskRecord.java b/src/main/java/com/wms/entity/table/PickTaskRecord.java new file mode 100644 index 0000000..2b61035 --- /dev/null +++ b/src/main/java/com/wms/entity/table/PickTaskRecord.java @@ -0,0 +1,4 @@ +package com.wms.entity.table; + +public class PickTaskRecord { +} diff --git a/src/main/java/com/wms/entity/table/Vehicle.java b/src/main/java/com/wms/entity/table/Vehicle.java index b44619c..b392ce0 100644 --- a/src/main/java/com/wms/entity/table/Vehicle.java +++ b/src/main/java/com/wms/entity/table/Vehicle.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler; import com.wms.entity.app.dto.extend.VehicleDetailInfo; import lombok.Data; +import java.time.LocalDateTime; + /** * 载具 */ @@ -43,4 +45,9 @@ public class Vehicle { */ @TableField(value = "details", typeHandler = Fastjson2TypeHandler.class) private VehicleDetailInfo details; + /** + * 上次入库时间 + */ + @TableField("last_in_time") + private LocalDateTime lastInTime; } diff --git a/src/main/java/com/wms/entity/table/WorkFlow.java b/src/main/java/com/wms/entity/table/WorkFlow.java new file mode 100644 index 0000000..e5bb541 --- /dev/null +++ b/src/main/java/com/wms/entity/table/WorkFlow.java @@ -0,0 +1,25 @@ +package com.wms.entity.table; + +/** + * 工作站台-工单-工位的工作流 + */ +public class WorkFlow { + /** + * id + */ + private String workFlowId; + /** + * 工作站台 + */ + private String workStation; + /** + * 工单 + */ + private String workOrder; + /** + * 工位 + */ + private String workCenter; + private String goodsId; + +}