BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b062c49bad11f33b338399f1ca3d32b3ff2547a5

Authored by YunaiV
1 parent 626f7193

✨ feat(mes): 添加批次号字段并更新查询逻辑 

新增批次号字段以支持更灵活的库存查询，优化了查询方法以包含批次号的模糊匹配，提升了库存管理的准确性和效率。
Inline Side-by-side
Showing 3 changed files with 7 additions and 4 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java
  View file @b062c49
... ... @@ -23,7 +23,9 @@ public class MesWmMaterialStockListReqVO {
23 23  
24 24 @Schema(description = "批次编号")
25 25 private Long batchId;
26   - // TODO @芋艿：后面看看，要不要 batchCode
  26 +
  27 + @Schema(description = "批次号")
  28 + private String batchCode;
27 29  
28 30 @Schema(description = "开始时间（动态盘点用）")
29 31 private LocalDateTime startTime;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
  View file @b062c49
... ... @@ -77,16 +77,17 @@ public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStock
77 77 .eqIfPresent(MesWmMaterialStockDO::getBatchId, batchId));
78 78 }
79 79  
80   - default List<MesWmMaterialStockDO> selectListForStockTaking(MesWmMaterialStockListReqVO reqVO) {
  80 + default List<MesWmMaterialStockDO> selectList(MesWmMaterialStockListReqVO reqVO) {
81 81 return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
82 82 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
83 83 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
84 84 .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
85 85 .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId())
86 86 .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
  87 + .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
87 88 .geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime())
88 89 .leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime())
89   - .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO) // TODO @芋艿：需要在考虑下，要不要支持；
  90 + .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
90 91 .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
91 92 }
92 93  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
  View file @b062c49
... ... @@ -123,7 +123,7 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService
123 123  
124 124 @Override
125 125 public List<MesWmMaterialStockDO> getMaterialStockList(MesWmMaterialStockListReqVO reqVO) {
126   - return materialStockMapper.selectListForStockTaking(reqVO);
  126 + return materialStockMapper.selectList(reqVO);
127 127 }
128 128  
129 129 @Override
... ...