✨ feat(stock): 添加供应商编号并移除库存精简列表接口

YunaiV
1 parent 289ac0c0
Showing 5 changed files with 4 additions and 25 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -113,15 +113,6 @@ public class MesWmMaterialStockController {
                 buildRespVOList(pageResult.getList()));
     }
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得库存精简列表", description = "主要用于前端下拉，可按 itemId 过滤")
-    @Parameter(name = "itemId", description = "物料编号", example = "1")
-    public CommonResult<List<MesWmMaterialStockRespVO>> getMaterialStockSimpleList(
-            @RequestParam(value = "itemId", required = false) Long itemId) {
-        List<MesWmMaterialStockDO> list = materialStockService.getMaterialStockList(itemId);
-        return success(buildRespVOList(list));
-    }
-
     // ==================== 拼接 VO ====================
     private List<MesWmMaterialStockRespVO> buildRespVOList(List<MesWmMaterialStockDO> list) {
@@ -27,6 +27,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam {
     @Schema(description = "库区编号", example = "1")
     private Long locationId;
+    @Schema(description = "供应商编号", example = "1")
+    private Long vendorId;
+
     @Schema(description = "是否冻结", example = "false")
     private Boolean frozen;
@@ -28,6 +28,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX&lt;MesWmMaterialStock
                 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
                 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
+                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                 .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen())
                 .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                 .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
@@ -97,14 +97,6 @@ public interface MesWmMaterialStockService {
     List<MesWmMaterialStockDO> getMaterialStockList(MesWmMaterialStockListReqVO reqVO);
     /**
-     * 获得库存精简列表（用于前端下拉选择）
-     *
-     * @param itemId 物料编号（可为 null）
-     * @return 库存记录列表
-     */
-    List<MesWmMaterialStockDO> getMaterialStockList(Long itemId);
-
-    /**
      * 获取或创建库存记录（按组合键唯一）
      *
      * @param itemId         物料编号
@@ -129,14 +129,6 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService 
     }
     @Override
-    public List<MesWmMaterialStockDO> getMaterialStockList(Long itemId) {
-        if (itemId != null) {
-            return materialStockMapper.selectList(MesWmMaterialStockDO::getItemId, itemId);
-        }
-        return materialStockMapper.selectList();
-    }
-
-    @Override
     public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
                                                          Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
         // 1. 查找已有库存记录