Commit 16a0c9e0fb70ae80a175569d64818edc610bcb67
1 parent
7994dae7
✨ feat(package): 添加状态字段并重构装箱单选择逻辑
新增装箱单和盘点方案的状态字段，优化装箱单选择器的交互方式，支持通过弹窗选择装箱单。移除不再使用的接口和方法，提升代码整洁性和可维护性。
Showing
7 changed files
with
9 additions
and
51 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
| ... | ... | @@ -125,20 +125,6 @@ public class MesWmPackageController { |
| 125 | 125 | return success(true); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - @GetMapping("/childable-simple-list") | |
| 129 | - @Operation(summary = "可添加为子箱的装箱单精简列表") | |
| 130 | - @PreAuthorize("@ss.hasPermission('mes:wm-package:query')") | |
| 131 | - public CommonResult<List<MesWmPackageRespVO>> getChildablePackageSimpleList() { | |
| 132 | - List<MesWmPackageDO> list = packageService.getChildablePackageList(); | |
| 133 | - return success(buildRespVOList(list)); | |
| 134 | - } | |
| 135 | - | |
| 136 | - @GetMapping("/simple-list") | |
| 137 | - @Operation(summary = "获得装箱单精简列表", description = "主要用于前端的下拉选项") | |
| 138 | - public CommonResult<List<MesWmPackageRespVO>> getPackageSimpleList() { | |
| 139 | - List<MesWmPackageDO> list = packageService.getPackageSimpleList(); | |
| 140 | - return success(buildRespVOList(list)); | |
| 141 | - } | |
| 142 | 128 | |
| 143 | 129 | // ========== 私有方法 ========== |
| 144 | 130 | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanPageReqVO.java
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; |
| 5 | 5 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 6 | 6 | import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO; |
| 7 | 7 | import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO; |
| 8 | -import cn.iocoder.yudao.module.mes.enums.wm.MesWmPackageStatusEnum; | |
| 8 | + | |
| 9 | 9 | import org.apache.ibatis.annotations.Mapper; |
| 10 | 10 | |
| 11 | 11 | import java.util.Collection; |
| ... | ... | @@ -26,6 +26,7 @@ public interface MesWmPackageMapper extends BaseMapperX<MesWmPackageDO> { |
| 26 | 26 | .eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId()) |
| 27 | 27 | .eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId()) |
| 28 | 28 | .eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId()) |
| 29 | + .eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus()) | |
| 29 | 30 | .orderByDesc(MesWmPackageDO::getId)); |
| 30 | 31 | } |
| 31 | 32 | |
| ... | ... | @@ -42,11 +43,5 @@ public interface MesWmPackageMapper extends BaseMapperX<MesWmPackageDO> { |
| 42 | 43 | .in(MesWmPackageDO::getParentId, parentIds)); |
| 43 | 44 | } |
| 44 | 45 | |
| 45 | - default List<MesWmPackageDO> selectChildableList() { | |
| 46 | - return selectList(new LambdaQueryWrapperX<MesWmPackageDO>() | |
| 47 | - .eq(MesWmPackageDO::getParentId, MesWmPackageDO.PARENT_ID_ROOT) | |
| 48 | - .eq(MesWmPackageDO::getStatus, MesWmPackageStatusEnum.FINISHED.getStatus()) | |
| 49 | - .orderByDesc(MesWmPackageDO::getId)); | |
| 50 | - } | |
| 51 | 46 | |
| 52 | 47 | } | ... | ... |
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 |
| 7 | 7 | import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO; |
| 8 | 8 | import org.apache.ibatis.annotations.Mapper; |
| 9 | 9 | |
| 10 | -import java.util.List; | |
| 11 | 10 | |
| 12 | 11 | /** |
| 13 | 12 | * MES 盘点方案 Mapper |
| ... | ... | @@ -26,12 +25,7 @@ public interface MesWmStockTakingPlanMapper extends BaseMapperX<MesWmStockTaking |
| 26 | 25 | .likeIfPresent(MesWmStockTakingPlanDO::getCode, reqVO.getCode()) |
| 27 | 26 | .likeIfPresent(MesWmStockTakingPlanDO::getName, reqVO.getName()) |
| 28 | 27 | .eqIfPresent(MesWmStockTakingPlanDO::getType, reqVO.getType()) |
| 29 | - .orderByDesc(MesWmStockTakingPlanDO::getId)); | |
| 30 | - } | |
| 31 | - | |
| 32 | - default List<MesWmStockTakingPlanDO> selectListByStatus(Integer status) { | |
| 33 | - return selectList(new LambdaQueryWrapperX<MesWmStockTakingPlanDO>() | |
| 34 | - .eqIfPresent(MesWmStockTakingPlanDO::getStatus, status) | |
| 28 | + .eqIfPresent(MesWmStockTakingPlanDO::getStatus, reqVO.getStatus()) | |
| 35 | 29 | .orderByDesc(MesWmStockTakingPlanDO::getId)); |
| 36 | 30 | } |
| 37 | 31 | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java
| ... | ... | @@ -82,19 +82,6 @@ public interface MesWmPackageService { |
| 82 | 82 | */ |
| 83 | 83 | void removeChildPackage(Long childId); |
| 84 | 84 | |
| 85 | - /** | |
| 86 | - * 可添加为子箱的装箱单列表（无父箱 + 已完成状态） | |
| 87 | - * | |
| 88 | - * @return 装箱单列表 | |
| 89 | - */ | |
| 90 | - List<MesWmPackageDO> getChildablePackageList(); | |
| 91 | - | |
| 92 | - /** | |
| 93 | - * 获得装箱单精简列表 | |
| 94 | - * | |
| 95 | - * @return 装箱单列表 | |
| 96 | - */ | |
| 97 | - List<MesWmPackageDO> getPackageSimpleList(); | |
| 98 | 85 | |
| 99 | 86 | /** |
| 100 | 87 | * 获取指定装箱单及其所有子孙箱的 ID 列表 | ... | ... |
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 { |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | @Override |
| 141 | - public List<MesWmPackageDO> getChildablePackageList() { | |
| 142 | - return packageMapper.selectChildableList(); | |
| 143 | - } | |
| 144 | - | |
| 145 | - @Override | |
| 146 | - public List<MesWmPackageDO> getPackageSimpleList() { | |
| 147 | - return packageMapper.selectList(); | |
| 148 | - } | |
| 149 | - | |
| 150 | - @Override | |
| 151 | 141 | public List<Long> getPackageAndDescendantIds(Long packageId) { |
| 152 | 142 | List<Long> result = CollUtil.newArrayList(packageId); |
| 153 | 143 | // 使用广度优先搜索 (BFS) 按层批量查询所有子孙箱 ID | ... | ... |