出入库流水添加 仓库名称 产品自定义编码搜索

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockJournalSelectDto;
@@ -15,9 +16,7 @@ import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.mapper.stock.StockJournalDetailsMapper;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
-import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,8 +40,6 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
     @Autowired
     private ProductInfoService productInfoService;
     @Autowired
-    private WarehouseService warehouseService;
-    @Autowired
     private StockWaitService stockWaitService;
 
     @Override
@@ -54,10 +51,17 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         wrapper.eq("sj.to_warehouse_id", dto.getToWarehouseId());
         wrapper.eq("sjd.product_id", dto.getProductId());
         wrapper.orderByDesc("sj", StockJournal::getCreateTime);
-        wrapper.keyword(dto.getKeyword(),
-                new SqlField("w.name"),
-                new SqlField("sj.link_code")
-        );
+
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            //产品编号过滤
+            List<Long> productIds = productInfoService.listObject(ProductInfo::getId, q -> q.like(ProductInfo::getCustomCode, dto.getKeyword()).or()
+                    .like(ProductInfo::getName, dto.getKeyword()));
+            wrapper.and(q -> q.like("w.name", dto.getKeyword()).or()
+                    .like("sj.link_code", dto.getKeyword()).or()
+                    .in("sjd.product_id", productIds)
+            );
+        }
+
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {