|
@@ -2,7 +2,6 @@ package com.fjhx.wms.service.stock.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
@@ -50,7 +49,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
|
|
|
wrapper.eq("sj.type", dto.getType());
|
|
|
wrapper.like("w.name", dto.getKeyword());
|
|
|
wrapper.eq("w.id", dto.getWarehouseId());
|
|
|
- wrapper.eq("sj.to_warehouse_id", dto.getToWarehouseId());
|
|
|
+ wrapper.eq("sj.warehouse_id", dto.getWarehouseId());
|
|
|
wrapper.eq("sjd.product_id", dto.getProductId());
|
|
|
wrapper.orderByDesc("sj", StockJournal::getCreateTime);
|
|
|
Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|