BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 57a289add496d6088a8369a1eab4a98574273304

Authored by YunaiV
1 parent 289ac0c0

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

Inline Side-by-side
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
  View file @57a289a
... ... @@ -113,15 +113,6 @@ public class MesWmMaterialStockController {
113 113 buildRespVOList(pageResult.getList()));
114 114 }
115 115  
116   - @GetMapping("/simple-list")
117   - @Operation(summary = "获得库存精简列表", description = "主要用于前端下拉，可按 itemId 过滤")
118   - @Parameter(name = "itemId", description = "物料编号", example = "1")
119   - public CommonResult<List<MesWmMaterialStockRespVO>> getMaterialStockSimpleList(
120   - @RequestParam(value = "itemId", required = false) Long itemId) {
121   - List<MesWmMaterialStockDO> list = materialStockService.getMaterialStockList(itemId);
122   - return success(buildRespVOList(list));
123   - }
124   -
125 116 // ==================== 拼接 VO ====================
126 117  
127 118 private List<MesWmMaterialStockRespVO> buildRespVOList(List<MesWmMaterialStockDO> list) {
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
  View file @57a289a
... ... @@ -27,6 +27,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam {
27 27 @Schema(description = "库区编号", example = "1")
28 28 private Long locationId;
29 29  
  30 + @Schema(description = "供应商编号", example = "1")
  31 + private Long vendorId;
  32 +
30 33 @Schema(description = "是否冻结", example = "false")
31 34 private Boolean frozen;
32 35  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
  View file @57a289a
... ... @@ -28,6 +28,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX&lt;MesWmMaterialStock
28 28 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
29 29 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
30 30 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
  31 + .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
31 32 .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen())
32 33 .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
33 34 .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
  View file @57a289a
... ... @@ -97,14 +97,6 @@ public interface MesWmMaterialStockService {
97 97 List<MesWmMaterialStockDO> getMaterialStockList(MesWmMaterialStockListReqVO reqVO);
98 98  
99 99 /**
100   - * 获得库存精简列表（用于前端下拉选择）
101   - *
102   - * @param itemId 物料编号（可为 null）
103   - * @return 库存记录列表
104   - */
105   - List<MesWmMaterialStockDO> getMaterialStockList(Long itemId);
106   -
107   - /**
108 100 * 获取或创建库存记录（按组合键唯一）
109 101 *
110 102 * @param itemId 物料编号
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
  View file @57a289a
... ... @@ -129,14 +129,6 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService
129 129 }
130 130  
131 131 @Override
132   - public List<MesWmMaterialStockDO> getMaterialStockList(Long itemId) {
133   - if (itemId != null) {
134   - return materialStockMapper.selectList(MesWmMaterialStockDO::getItemId, itemId);
135   - }
136   - return materialStockMapper.selectList();
137   - }
138   -
139   - @Override
140 132 public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
141 133 Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
142 134 // 1. 查找已有库存记录
... ...