From 9c0bc5b25eb82a7d9bd6239a1cd85d5808e3a0fb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 10 Mar 2026 00:39:53 +0800 Subject: [PATCH] ✨ feat(mes): 添加盘点任务相关的请求和响应 VO --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskResultController.java | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskCancelReqVO.java | 15 +++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskFinishReqVO.java | 15 +++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskPageReqVO.java | 40 ++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskStartReqVO.java | 15 +++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineBatchUpdateReqVO.java | 41 +++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineRespVO.java | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultPageReqVO.java | 28 ++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultRespVO.java | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java | 13 +++---------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java | 6 ++++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskResultMapper.java | 6 ++++-- 15 files changed, 818 insertions(+), 14 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskResultController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskCancelReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskFinishReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskStartReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineBatchUpdateReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultRespVO.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java new file mode 100644 index 0000000..f6ae279 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java @@ -0,0 +1,222 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.*; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineBatchUpdateReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineRespVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO; +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.service.md.item.MesMdItemService; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.wm.stocktaking.plan.MesWmStockTakingPlanService; +import cn.iocoder.yudao.module.mes.service.wm.stocktaking.task.MesWmStockTakingTaskService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.math.BigDecimal; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 盘点任务") +@RestController +@RequestMapping("/mes/wm/stocktaking-task") +@Validated +public class MesWmStockTakingTaskController { + + @Resource + private MesWmStockTakingTaskService stockTakingTaskService; + @Resource + private MesWmStockTakingPlanService stockTakingPlanService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:create')") + public CommonResult createStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskSaveReqVO createReqVO) { + return success(stockTakingTaskService.createStockTakingTask(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')") + public CommonResult updateStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskSaveReqVO updateReqVO) { + stockTakingTaskService.updateStockTakingTask(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除盘点任务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:delete')") + public CommonResult deleteStockTakingTask(@RequestParam("id") Long id) { + stockTakingTaskService.deleteStockTakingTask(id); + return success(true); + } + + @PutMapping("/submit") + @Operation(summary = "提交盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')") + public CommonResult submitStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskSubmitReqVO reqVO) { + stockTakingTaskService.submitStockTakingTask(reqVO.getId()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得盘点任务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult getStockTakingTask(@RequestParam("id") Long id) { + MesWmStockTakingTaskDO task = stockTakingTaskService.getStockTakingTask(id); + if (task == null) { + return success(null); + } + return success(buildTaskRespVOList(Collections.singletonList(task)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得盘点任务分页") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult> getStockTakingTaskPage(@Valid MesWmStockTakingTaskPageReqVO pageReqVO) { + PageResult pageResult = stockTakingTaskService.getStockTakingTaskPage(pageReqVO); + return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出盘点任务 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportStockTakingTaskExcel(@Valid MesWmStockTakingTaskPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = stockTakingTaskService.getStockTakingTaskPage(pageReqVO); + ExcelUtils.write(response, "盘点任务.xls", "数据", MesWmStockTakingTaskRespVO.class, + buildTaskRespVOList(pageResult.getList())); + } + + @PutMapping("/start") + @Operation(summary = "开始盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')") + public CommonResult startStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskStartReqVO reqVO) { + stockTakingTaskService.startStockTakingTask(reqVO.getId()); + return success(true); + } + + @PutMapping("/finish") + @Operation(summary = "完成盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:finish')") + public CommonResult finishStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskFinishReqVO reqVO) { + stockTakingTaskService.finishStockTakingTask(reqVO.getId()); + return success(true); + } + + @PutMapping("/cancel") + @Operation(summary = "取消盘点任务") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')") + public CommonResult cancelStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskCancelReqVO reqVO) { + stockTakingTaskService.cancelStockTakingTask(reqVO.getId()); + return success(true); + } + + @PutMapping("/line-batch-update") + @Operation(summary = "批量更新盘点任务行") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')") + public CommonResult updateStockTakingTaskLines(@Valid @RequestBody MesWmStockTakingTaskLineBatchUpdateReqVO reqVO) { + stockTakingTaskService.updateStockTakingTaskLines(reqVO); + return success(true); + } + + @GetMapping("/line-list") + @Operation(summary = "获得盘点任务行列表") + @Parameter(name = "taskId", description = "任务编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult> getStockTakingTaskLineList(@RequestParam("taskId") Long taskId) { + return success(buildTaskLineRespVOList(stockTakingTaskService.getStockTakingTaskLineList(taskId))); + } + + private List buildTaskRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + Map userMap = adminUserApi.getUserMap(convertSet(list, MesWmStockTakingTaskDO::getUserId)); + Map planMap = stockTakingPlanService.getStockTakingPlanMap(convertSet(list, MesWmStockTakingTaskDO::getPlanId)); + return BeanUtils.toBean(list, MesWmStockTakingTaskRespVO.class, vo -> { + MapUtils.findAndThen(userMap, vo.getUserId(), user -> vo.setUserNickname(user.getNickname())); + MapUtils.findAndThen(planMap, vo.getPlanId(), plan -> { + vo.setPlanCode(plan.getCode()); + vo.setPlanName(plan.getName()); + }); + }); + } + + private List buildTaskLineRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + Map itemMap = itemService.getItemMap(convertSet(list, MesWmStockTakingTaskLineDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + Map warehouseMap = warehouseService.getWarehouseMap(convertSet(list, MesWmStockTakingTaskLineDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap(convertSet(list, MesWmStockTakingTaskLineDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap(convertSet(list, MesWmStockTakingTaskLineDO::getAreaId)); + return BeanUtils.toBean(list, MesWmStockTakingTaskLineRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()); + vo.setItemName(item.getName()); + vo.setSpecification(item.getSpecification()); + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit -> vo.setUnitMeasureName(unit.getName())); + }); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), area -> vo.setAreaName(area.getName())); + vo.setDifferenceQuantity(defaultQuantity(vo.getTakingQuantity()).subtract(defaultQuantity(vo.getQuantity()))); + }); + } + + private BigDecimal defaultQuantity(BigDecimal quantity) { + return quantity == null ? BigDecimal.ZERO : quantity; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskResultController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskResultController.java new file mode 100644 index 0000000..6715d2c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskResultController.java @@ -0,0 +1,129 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultRespVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO; +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.service.md.item.MesMdItemService; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.wm.stocktaking.task.MesWmStockTakingTaskResultService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 盘点结果") +@RestController +@RequestMapping("/mes/wm/stocktaking-task-result") +@Validated +public class MesWmStockTakingTaskResultController { + + @Resource + private MesWmStockTakingTaskResultService stockTakingTaskResultService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; + + @GetMapping("/get") + @Operation(summary = "获得盘点结果") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult getStockTakingTaskResult(@RequestParam("id") Long id) { + MesWmStockTakingTaskResultDO result = stockTakingTaskResultService.getStockTakingTaskResult(id); + if (result == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(result)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得盘点结果分页") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult> getStockTakingTaskResultPage(@Valid MesWmStockTakingTaskResultPageReqVO pageReqVO) { + PageResult pageResult = stockTakingTaskResultService.getStockTakingTaskResultPage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/list") + @Operation(summary = "获得盘点结果列表") + @Parameter(name = "taskId", description = "任务编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')") + public CommonResult> getStockTakingTaskResultList(@RequestParam("taskId") Long taskId) { + return success(buildRespVOList(stockTakingTaskResultService.getStockTakingTaskResultList(taskId))); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出盘点结果 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportStockTakingTaskResultExcel(@Valid MesWmStockTakingTaskResultPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = stockTakingTaskResultService.getStockTakingTaskResultPage(pageReqVO); + ExcelUtils.write(response, "盘点结果.xls", "数据", MesWmStockTakingTaskResultRespVO.class, + buildRespVOList(pageResult.getList())); + } + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + Map itemMap = itemService.getItemMap(convertSet(list, MesWmStockTakingTaskResultDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + Map warehouseMap = warehouseService.getWarehouseMap(convertSet(list, MesWmStockTakingTaskResultDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap(convertSet(list, MesWmStockTakingTaskResultDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap(convertSet(list, MesWmStockTakingTaskResultDO::getAreaId)); + return BeanUtils.toBean(list, MesWmStockTakingTaskResultRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()); + vo.setItemName(item.getName()); + vo.setSpecification(item.getSpecification()); + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit -> vo.setUnitMeasureName(unit.getName())); + }); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), area -> vo.setAreaName(area.getName())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskCancelReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskCancelReqVO.java new file mode 100644 index 0000000..639d351 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskCancelReqVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 盘点任务取消 Request VO") +@Data +public class MesWmStockTakingTaskCancelReqVO { + + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "任务编号不能为空") + private Long id; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskFinishReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskFinishReqVO.java new file mode 100644 index 0000000..210aae7 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskFinishReqVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 盘点任务完成 Request VO") +@Data +public class MesWmStockTakingTaskFinishReqVO { + + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "任务编号不能为空") + private Long id; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskPageReqVO.java new file mode 100644 index 0000000..ac2c3a0 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskPageReqVO.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - MES 盘点任务分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +public class MesWmStockTakingTaskPageReqVO extends PageParam { + + @Schema(description = "任务编码", example = "ST202603080001") + private String code; + + @Schema(description = "任务名称", example = "原料仓月度盘点任务") + private String name; + + @Schema(description = "盘点类型", example = "1") + private Integer type; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "盘点人 ID", example = "1") + private Long userId; + + @Schema(description = "来源方案 ID", example = "1") + private Long planId; + + @Schema(description = "盘点日期范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] takingDate; + +} 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 new file mode 100644 index 0000000..b61ed54 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java @@ -0,0 +1,89 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 盘点任务 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesWmStockTakingTaskRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "任务编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "ST202603080001") + @ExcelProperty("任务编码") + private String code; + + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "原料仓月度盘点任务") + @ExcelProperty("任务名称") + private String name; + + @Schema(description = "盘点日期") + @ExcelProperty("盘点日期") + private LocalDateTime takingDate; + + @Schema(description = "盘点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("盘点类型") + private Integer type; + + @Schema(description = "盘点人 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long userId; + + @Schema(description = "盘点人昵称", example = "管理员") + @ExcelProperty("盘点人") + private String userNickname; + + @Schema(description = "来源方案 ID", example = "1") + private Long planId; + + @Schema(description = "来源方案编码", example = "STP202603080001") + @ExcelProperty("方案编码") + private String planCode; + + @Schema(description = "来源方案名称", example = "原料仓月度盘点方案") + @ExcelProperty("方案名称") + private String planName; + + @Schema(description = "是否盲盘", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @ExcelProperty("是否盲盘") + private Boolean blindFlag; + + @Schema(description = "是否冻结库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @ExcelProperty("是否冻结库存") + private Boolean frozenFlag; + + @Schema(description = "快照时间") + @ExcelProperty("快照时间") + private LocalDateTime snapshotTime; + + @Schema(description = "开始时间") + @ExcelProperty("开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + @ExcelProperty("结束时间") + private LocalDateTime endTime; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty("状态") + private Integer status; + + @Schema(description = "是否已调账", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @ExcelProperty("是否已调账") + private Boolean adjustedFlag; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} 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 new file mode 100644 index 0000000..d24944e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java @@ -0,0 +1,50 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 盘点任务新增/修改 Request VO") +@Data +public class MesWmStockTakingTaskSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "任务编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "ST202603080001") + @NotEmpty(message = "任务编码不能为空") + private String code; + + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "原料仓月度盘点任务") + @NotEmpty(message = "任务名称不能为空") + private String name; + + @Schema(description = "盘点日期") + private LocalDateTime takingDate; + + @Schema(description = "盘点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "盘点类型不能为空") + private Integer type; + + @Schema(description = "盘点人 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "盘点人不能为空") + private Long userId; + + @Schema(description = "来源方案 ID", example = "1") + private Long planId; + + @Schema(description = "是否盲盘", example = "false") + @NotNull(message = "是否盲盘不能为空") + private Boolean blindFlag; + + @Schema(description = "是否冻结库存", example = "false") + @NotNull(message = "是否冻结库存不能为空") + private Boolean frozenFlag; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskStartReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskStartReqVO.java new file mode 100644 index 0000000..7f8fcd0 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskStartReqVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 盘点任务开始 Request VO") +@Data +public class MesWmStockTakingTaskStartReqVO { + + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "任务编号不能为空") + private Long id; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineBatchUpdateReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineBatchUpdateReqVO.java new file mode 100644 index 0000000..114e441 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineBatchUpdateReqVO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Schema(description = "管理后台 - MES 盘点任务行批量更新 Request VO") +@Data +public class MesWmStockTakingTaskLineBatchUpdateReqVO { + + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "任务编号不能为空") + private Long taskId; + + @Schema(description = "任务行列表") + @NotEmpty(message = "任务行不能为空") + @Valid + private List items; + + @Data + public static class Item { + + @Schema(description = "任务行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "任务行编号不能为空") + private Long id; + + @Schema(description = "实盘数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "98.000000") + @NotNull(message = "实盘数量不能为空") + private BigDecimal takingQuantity; + + @Schema(description = "备注", example = "备注") + private String remark; + + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineRespVO.java new file mode 100644 index 0000000..f9377a5 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/line/MesWmStockTakingTaskLineRespVO.java @@ -0,0 +1,75 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 盘点任务行 Response VO") +@Data +public class MesWmStockTakingTaskLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "任务 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long taskId; + + @Schema(description = "库存台账 ID", example = "1") + private Long materialStockId; + + @Schema(description = "物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "ITEM001") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + private String unitMeasureName; + + @Schema(description = "批次 ID", example = "1") + private Long batchId; + + @Schema(description = "批次编码", example = "B202603080001") + private String batchCode; + + @Schema(description = "账面数量", example = "100.000000") + private BigDecimal quantity; + + @Schema(description = "实盘数量", example = "98.000000") + private BigDecimal takingQuantity; + + @Schema(description = "差异数量", example = "-2.000000") + private BigDecimal differenceQuantity; + + @Schema(description = "仓库 ID", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原料仓") + private String warehouseName; + + @Schema(description = "库区 ID", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A 区") + private String locationName; + + @Schema(description = "库位 ID", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A-01") + private String areaName; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + private Integer status; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultPageReqVO.java new file mode 100644 index 0000000..5469400 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultPageReqVO.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Schema(description = "管理后台 - MES 盘点结果分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +public class MesWmStockTakingTaskResultPageReqVO extends PageParam { + + @Schema(description = "任务编号", example = "1") + private Long taskId; + + @Schema(description = "物料编号", example = "1") + private Long itemId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultRespVO.java new file mode 100644 index 0000000..8f074d8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultRespVO.java @@ -0,0 +1,88 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 盘点结果 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesWmStockTakingTaskResultRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "任务 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long taskId; + + @Schema(description = "任务行 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long lineId; + + @Schema(description = "库存台账 ID", example = "1") + private Long materialStockId; + + @Schema(description = "物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "ITEM001") + @ExcelProperty("物料编码") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + @ExcelProperty("物料名称") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + @ExcelProperty("规格型号") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + @ExcelProperty("计量单位") + private String unitMeasureName; + + @Schema(description = "批次 ID", example = "1") + private Long batchId; + + @Schema(description = "批次编码", example = "B202603080001") + @ExcelProperty("批次编码") + private String batchCode; + + @Schema(description = "仓库 ID", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原料仓") + @ExcelProperty("仓库") + private String warehouseName; + + @Schema(description = "库区 ID", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A 区") + @ExcelProperty("库区") + private String locationName; + + @Schema(description = "库位 ID", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A-01") + @ExcelProperty("库位") + private String areaName; + + @Schema(description = "账面数量", example = "100.000000") + @ExcelProperty("账面数量") + private BigDecimal quantity; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java index a2cd84a..cda7a4e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java @@ -2,15 +2,16 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.MesWmStockTakingTaskLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO; import org.apache.ibatis.annotations.Mapper; -import java.util.Collection; import java.util.List; import java.util.Set; /** * MES 盘点任务行 Mapper + * + * @author 芋道源码 */ @Mapper public interface MesWmStockTakingTaskLineMapper extends BaseMapperX { @@ -21,14 +22,6 @@ public interface MesWmStockTakingTaskLineMapper extends BaseMapperX selectListByTaskIds(Collection taskIds) { - return selectList(MesWmStockTakingTaskLineDO::getTaskId, taskIds); - } - - default List selectListByIds(Collection ids) { - return selectByIds(ids); - } - default List selectListByTaskIdAndIds(Long taskId, Set ids) { return selectList(new LambdaQueryWrapperX() .eq(MesWmStockTakingTaskLineDO::getTaskId, taskId) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java index 984df31..227d428 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java @@ -3,12 +3,14 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.vo.task.MesWmStockTakingTaskPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.MesWmStockTakingTaskDO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.MesWmStockTakingTaskPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO; import org.apache.ibatis.annotations.Mapper; /** * MES 盘点任务 Mapper + * + * @author 芋道源码 */ @Mapper public interface MesWmStockTakingTaskMapper extends BaseMapperX { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskResultMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskResultMapper.java index 46dc601..0e16130 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskResultMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskResultMapper.java @@ -3,14 +3,16 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.vo.result.MesWmStockTakingTaskResultPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.MesWmStockTakingTaskResultDO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * MES 盘点结果 Mapper + * + * @author 芋道源码 */ @Mapper public interface MesWmStockTakingTaskResultMapper extends BaseMapperX { -- libgit2 0.21.4