✨ feat(package): 添加状态字段并重构装箱单选择逻辑

新增装箱单和盘点方案的状态字段，优化装箱单选择器的交互方式，支持通过弹窗选择装箱单。移除不再使用的接口和方法，提升代码整洁性和可维护性。

✨ feat(package): 添加状态字段并重构装箱单选择逻辑
新增装箱单和盘点方案的状态字段，优化装箱单选择器的交互方式，支持通过弹窗选择装箱单。移除不再使用的接口和方法，提升代码整洁性和可维护性。
YunaiV
1 parent 7994dae7
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
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
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/plan/MesWmStockTakingPlanMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.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<List<MesWmPackageRespVO>> getChildablePackageSimpleList() {
-        List<MesWmPackageDO> list = packageService.getChildablePackageList();
-        return success(buildRespVOList(list));
-    }
-
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得装箱单精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesWmPackageRespVO>> getPackageSimpleList() {
-        List<MesWmPackageDO> list = packageService.getPackageSimpleList();
-        return success(buildRespVOList(list));
-    }
     // ========== 私有方法 ==========
@@ -32,4 +32,7 @@ public class MesWmPackagePageReqVO extends PageParam {
     @Schema(description = "检查员用户 ID", example = "1")
     private Long inspectorUserId;
+    @Schema(description = "单据状态", example = "1")
+    private Integer status;
+
 }
@@ -19,4 +19,7 @@ public class MesWmStockTakingPlanPageReqVO extends PageParam {
     @Schema(description = "盘点类型", example = "1")
     private Integer type;
+    @Schema(description = "状态", example = "0")
+    private Integer status;
+
 }
@@ -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&lt;MesWmPackageDO&gt; {
                 .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&lt;MesWmPackageDO&gt; {
                 .in(MesWmPackageDO::getParentId, parentIds));
     }
-    default List<MesWmPackageDO> selectChildableList() {
-        return selectList(new LambdaQueryWrapperX<MesWmPackageDO>()
-                .eq(MesWmPackageDO::getParentId, MesWmPackageDO.PARENT_ID_ROOT)
-                .eq(MesWmPackageDO::getStatus, MesWmPackageStatusEnum.FINISHED.getStatus())
-                .orderByDesc(MesWmPackageDO::getId));
-    }
 }
@@ -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&lt;MesWmStockTaking
                 .likeIfPresent(MesWmStockTakingPlanDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesWmStockTakingPlanDO::getName, reqVO.getName())
                 .eqIfPresent(MesWmStockTakingPlanDO::getType, reqVO.getType())
-                .orderByDesc(MesWmStockTakingPlanDO::getId));
-    }
-
-    default List<MesWmStockTakingPlanDO> selectListByStatus(Integer status) {
-        return selectList(new LambdaQueryWrapperX<MesWmStockTakingPlanDO>()
-                .eqIfPresent(MesWmStockTakingPlanDO::getStatus, status)
+                .eqIfPresent(MesWmStockTakingPlanDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesWmStockTakingPlanDO::getId));
     }
@@ -82,19 +82,6 @@ public interface MesWmPackageService {
      */
     void removeChildPackage(Long childId);
-    /**
-     * 可添加为子箱的装箱单列表（无父箱 + 已完成状态）
-     *
-     * @return 装箱单列表
-     */
-    List<MesWmPackageDO> getChildablePackageList();
-
-    /**
-     * 获得装箱单精简列表
-     *
-     * @return 装箱单列表
-     */
-    List<MesWmPackageDO> getPackageSimpleList();
     /**
      * 获取指定装箱单及其所有子孙箱的 ID 列表
@@ -138,16 +138,6 @@ public class MesWmPackageServiceImpl implements MesWmPackageService {
     }
     @Override
-    public List<MesWmPackageDO> getChildablePackageList() {
-        return packageMapper.selectChildableList();
-    }
-
-    @Override
-    public List<MesWmPackageDO> getPackageSimpleList() {
-        return packageMapper.selectList();
-    }
-
-    @Override
     public List<Long> getPackageAndDescendantIds(Long packageId) {
         List<Long> result = CollUtil.newArrayList(packageId);
         // 使用广度优先搜索 (BFS) 按层批量查询所有子孙箱 ID