diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java index 70b4d0f..a2cf6b8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java @@ -125,20 +125,6 @@ public class MesWmPackageController { return success(true); } - @GetMapping("/childable-simple-list") - @Operation(summary = "可添加为子箱的装箱单精简列表") - @PreAuthorize("@ss.hasPermission('mes:wm-package:query')") - public CommonResult> getChildablePackageSimpleList() { - List list = packageService.getChildablePackageList(); - return success(buildRespVOList(list)); - } - - @GetMapping("/simple-list") - @Operation(summary = "获得装箱单精简列表", description = "主要用于前端的下拉选项") - public CommonResult> getPackageSimpleList() { - List list = packageService.getPackageSimpleList(); - return success(buildRespVOList(list)); - } // ========== 私有方法 ========== diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java index 08cb219..f5dec9e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java @@ -32,4 +32,7 @@ public class MesWmPackagePageReqVO extends PageParam { @Schema(description = "检查员用户 ID", example = "1") private Long inspectorUserId; + @Schema(description = "单据状态", example = "1") + private Integer status; + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanPageReqVO.java index e4153a5..bda1fa1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanPageReqVO.java @@ -19,4 +19,7 @@ public class MesWmStockTakingPlanPageReqVO extends PageParam { @Schema(description = "盘点类型", example = "1") private Integer type; + @Schema(description = "状态", example = "0") + private Integer status; + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java index 97d6a0d..d964e2b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java @@ -5,7 +5,7 @@ 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.packages.vo.MesWmPackagePageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO; -import cn.iocoder.yudao.module.mes.enums.wm.MesWmPackageStatusEnum; + import org.apache.ibatis.annotations.Mapper; import java.util.Collection; @@ -26,6 +26,7 @@ public interface MesWmPackageMapper extends BaseMapperX { .eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId()) .eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId()) .eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId()) + .eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus()) .orderByDesc(MesWmPackageDO::getId)); } @@ -42,11 +43,5 @@ public interface MesWmPackageMapper extends BaseMapperX { .in(MesWmPackageDO::getParentId, parentIds)); } - default List selectChildableList() { - return selectList(new LambdaQueryWrapperX() - .eq(MesWmPackageDO::getParentId, MesWmPackageDO.PARENT_ID_ROOT) - .eq(MesWmPackageDO::getStatus, MesWmPackageStatusEnum.FINISHED.getStatus()) - .orderByDesc(MesWmPackageDO::getId)); - } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/plan/MesWmStockTakingPlanMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/plan/MesWmStockTakingPlanMapper.java index b7cd733..fbfc191 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/plan/MesWmStockTakingPlanMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/plan/MesWmStockTakingPlanMapper.java @@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.plan.vo.MesWm import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO; import org.apache.ibatis.annotations.Mapper; -import java.util.List; /** * MES 盘点方案 Mapper @@ -26,12 +25,7 @@ public interface MesWmStockTakingPlanMapper extends BaseMapperX selectListByStatus(Integer status) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesWmStockTakingPlanDO::getStatus, status) + .eqIfPresent(MesWmStockTakingPlanDO::getStatus, reqVO.getStatus()) .orderByDesc(MesWmStockTakingPlanDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java index aab8124..288ea62 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java @@ -82,19 +82,6 @@ public interface MesWmPackageService { */ void removeChildPackage(Long childId); - /** - * 可添加为子箱的装箱单列表(无父箱 + 已完成状态) - * - * @return 装箱单列表 - */ - List getChildablePackageList(); - - /** - * 获得装箱单精简列表 - * - * @return 装箱单列表 - */ - List getPackageSimpleList(); /** * 获取指定装箱单及其所有子孙箱的 ID 列表 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java index 24a206f..b82cdce 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java @@ -138,16 +138,6 @@ public class MesWmPackageServiceImpl implements MesWmPackageService { } @Override - public List getChildablePackageList() { - return packageMapper.selectChildableList(); - } - - @Override - public List getPackageSimpleList() { - return packageMapper.selectList(); - } - - @Override public List getPackageAndDescendantIds(Long packageId) { List result = CollUtil.newArrayList(packageId); // 使用广度优先搜索 (BFS) 按层批量查询所有子孙箱 ID