diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java index b61ed54..4ca792d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java @@ -58,10 +58,6 @@ public class MesWmStockTakingTaskRespVO { @ExcelProperty("是否冻结库存") private Boolean frozenFlag; - @Schema(description = "快照时间") - @ExcelProperty("快照时间") - private LocalDateTime snapshotTime; - @Schema(description = "开始时间") @ExcelProperty("开始时间") private LocalDateTime startTime; @@ -74,10 +70,6 @@ public class MesWmStockTakingTaskRespVO { @ExcelProperty("状态") private Integer status; - @Schema(description = "是否已调账", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") - @ExcelProperty("是否已调账") - private Boolean adjustedFlag; - @Schema(description = "备注", example = "备注") @ExcelProperty("备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java index d24944e..5fc1197 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java @@ -36,6 +36,12 @@ public class MesWmStockTakingTaskSaveReqVO { @Schema(description = "来源方案 ID", example = "1") private Long planId; + @Schema(description = "开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + private LocalDateTime endTime; + @Schema(description = "是否盲盘", example = "false") @NotNull(message = "是否盲盘不能为空") private Boolean blindFlag; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java new file mode 100644 index 0000000..4d98659 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTaskStatusEnum; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTypeEnum; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * MES 盘点任务 DO + * + * @author 芋道源码 + */ +@TableName("mes_wm_stock_taking_task") +@KeySequence("mes_wm_stock_taking_task_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmStockTakingTaskDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 任务编码 + */ + private String code; + /** + * 任务名称 + */ + private String name; + /** + * 盘点日期 + */ + private LocalDateTime takingDate; + + /** + * 盘点类型 + * + * 枚举 {@link MesWmStockTakingTypeEnum} + */ + private Integer type; + /** + * 盘点人编号 + * + * 关联 AdminUserDO 的 id 字段 + */ + private Long userId; + + /** + * 盘点计划编号 + * + * 关联 {@link MesWmStockTakingPlanDO#getId()} + */ + private Long planId; + + /** + * 是否盲盘 + */ + private Boolean blindFlag; + /** + * 是否冻结库存 + */ + private Boolean frozenFlag; + + /** + * 开始时间 + */ + private LocalDateTime startTime; + /** + * 结束时间 + */ + private LocalDateTime endTime; + + /** + * 任务状态 + * + * 枚举 {@link MesWmStockTakingTaskStatusEnum} + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskLineDO.java new file mode 100644 index 0000000..1f39cef --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskLineDO.java @@ -0,0 +1,103 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTaskLineStatusEnum; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; + +/** + * MES 盘点任务行 DO + * + * @author 芋道源码 + */ +@TableName("mes_wm_stock_taking_task_line") +@KeySequence("mes_wm_stock_taking_task_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmStockTakingTaskLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 盘点任务编号 + * + * 关联 {@link MesWmStockTakingTaskDO#getId()} + */ + private Long taskId; + + /** + * 库存编号 + */ + private Long materialStockId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + + /** + * 批次编号 + */ + private Long batchId; + /** + * 批次编码 + */ + private String batchCode; + + /** + * 账面数量 + */ + private BigDecimal quantity; + /** + * 盘点数量 + */ + private BigDecimal takingQuantity; + + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} ()} + */ + private Long areaId; + + /** + * 盘点状态 + * + * 枚举 {@link MesWmStockTakingTaskLineStatusEnum} + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskResultDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskResultDO.java new file mode 100644 index 0000000..c7c4002 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskResultDO.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; + +/** + * MES 盘点结果 DO + * + * @author 芋道源码 + */ +@TableName("mes_wm_stock_taking_task_result") +@KeySequence("mes_wm_stock_taking_task_result_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmStockTakingTaskResultDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 盘点任务编号 + * + * 关联 {@link MesWmStockTakingTaskDO#getId()} + */ + private Long taskId; + /** + * 盘点任务行编号 + * + * 关联 {@link MesWmStockTakingTaskLineDO#getId()} + */ + private Long lineId; + + /** + * 库存编号 + */ + private Long materialStockId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + + /** + * 批次编号 + */ + private Long batchId; + /** + * 批次编码 + */ + private String batchCode; + + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + + /** + * 差异数量 + */ + private BigDecimal quantity; + + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 8f010b3..3aaf88c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -479,7 +479,7 @@ public interface ErrorCodeConstants { ErrorCode WM_STOCK_TAKING_TASK_NOT_EXISTS = new ErrorCode(1_040_714_110, "盘点任务不存在"); ErrorCode WM_STOCK_TAKING_TASK_CODE_DUPLICATE = new ErrorCode(1_040_714_111, "盘点任务编码已存在"); ErrorCode WM_STOCK_TAKING_TASK_NOT_PREPARE = new ErrorCode(1_040_714_112, "只有草稿状态的盘点任务才允许此操作"); - ErrorCode WM_STOCK_TAKING_TASK_NOT_IN_PROGRESS = new ErrorCode(1_040_714_113, "只有盘点中状态的任务才允许此操作"); + ErrorCode WM_STOCK_TAKING_TASK_NOT_APPROVING = new ErrorCode(1_040_714_113, "只有盘点中状态的任务才允许此操作"); ErrorCode WM_STOCK_TAKING_TASK_CANNOT_CANCEL = new ErrorCode(1_040_714_114, "已完成或已取消的盘点任务不允许取消"); ErrorCode WM_STOCK_TAKING_TASK_NO_STOCK = new ErrorCode(1_040_714_115, "未找到符合条件的库存数据"); ErrorCode WM_STOCK_TAKING_TASK_NO_LINE = new ErrorCode(1_040_714_116, "盘点任务至少需要一条任务行"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmStockTakingTaskStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmStockTakingTaskStatusEnum.java index bcf1384..d617305 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmStockTakingTaskStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmStockTakingTaskStatusEnum.java @@ -16,7 +16,7 @@ import java.util.Arrays; public enum MesWmStockTakingTaskStatusEnum implements ArrayValuable { PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), - IN_PROGRESS(MesOrderStatusConstants.CONFIRMED, "盘点中"), + APPROVING(MesOrderStatusConstants.APPROVING, "审批中"), FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), CANCELED(MesOrderStatusConstants.CANCELLED, "已取消");