调参增加调入、调出仓库搜索

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/stock/dto/StockTransferDetailsSelectDto.java

@@ -7,11 +7,21 @@ import lombok.Setter;
 /**
  * 调仓明细列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-17
  */
 @Getter
 @Setter
 public class StockTransferDetailsSelectDto extends BaseSelectDto {
 
+    /**
+     * 调入仓库id
+     */
+    private Long inWarehouseId;
+
+    /**
+     * 调出仓库id
+     */
+    private Long outWarehouseId;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferDetailsServiceImpl.java

@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsDto;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.stock.po.StockTransfer;
 import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
 import com.fjhx.victoriatourist.entity.stock.vo.StockTransferDetailsVo;
 import com.fjhx.victoriatourist.mapper.stock.StockTransferDetailsMapper;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
-import com.fjhx.wms.entity.stock.vo.StockVo;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -37,15 +37,17 @@ public class StockTransferDetailsServiceImpl extends ServiceImpl<StockTransferDe
     public Page<StockTransferDetailsVo> getPage(StockTransferDetailsSelectDto dto) {
         IWrapper<StockTransferDetails> wrapper = getWrapper();
         wrapper.orderByDesc("std", StockTransferDetails::getId);
+        wrapper.eq("st", StockTransfer::getInWarehouseId, dto.getInWarehouseId());
+        wrapper.eq("st", StockTransfer::getOutWarehouseId, dto.getOutWarehouseId());
         Page<StockTransferDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        //赋值产品信息
+        // 赋值产品信息
         productInfoService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCode());
             item.setProductUnit(productInfo.getUnit());
             item.setProductName(productInfo.getName());
             item.setProductSpec(productInfo.getSpec());
         });
-        //赋值仓库名称
+        // 赋值仓库名称
         warehouseService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getInWarehouseId, (item, warehouse) -> {
             item.setInWarehouseName(warehouse.getName());
         });