出入库流水添加关联单号搜索

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournal.java

@@ -41,11 +41,6 @@ public class StockJournal extends BasePo {
      */
     private Long warehouseId;
 
-//    /**
-//     * 调仓目标仓库id
-//     */
-//    private Long toWarehouseId;
-
     /**
      * 业务id
      */

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -58,15 +58,6 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      */
     private String opUserName;
 
-    /**
-     * 目标仓库id
-     */
-    private Long toWarehouseId;
-    /**
-     * 目标仓库名称
-     */
-    private String toWarehouseName;
-
     /**仓库单号*/
     private String code;
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalVo.java

@@ -21,8 +21,6 @@ public class StockJournalVo extends StockJournal {
      * 仓库名称
      */
     private String warehouseName;
-//    /**调仓库目标仓库名称*/
-//    private String toWarehouseName;
 
     /**
      * 操作人名称

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

@@ -17,6 +17,7 @@ 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;
@@ -49,11 +50,14 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         IWrapper<StockJournalDetails> wrapper = getWrapper();
         wrapper.eq("sj.op_type", dto.getOpType());
         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("sjd.product_id", dto.getProductId());
         wrapper.orderByDesc("sj", StockJournal::getCreateTime);
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("w.name"),
+                new SqlField("sj.link_code")
+        );
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {
@@ -70,10 +74,6 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         });
         //赋值操作人名称
         UserUtil.assignmentNickName(records, StockJournalDetailsVo::getCreateUser, StockJournalDetailsVo::setOpUserName);
-        //赋值目标仓库名称
-        warehouseService.attributeAssign(records, StockJournalDetailsVo::getToWarehouseId, (item, warehouse) -> {
-            item.setToWarehouseName(warehouse.getName());
-        });
         return page;
     }
 

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

@@ -57,10 +57,6 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         List<StockJournalVo> records = page.getRecords();
         //根据id赋值操作人名称
         UserUtil.assignmentNickName(records, StockJournalVo::getCreateUser, StockJournalVo::setUserName);
-        //如果为调参类型记录赋值目标仓库名称
-//        warehouseService.attributeAssign(records, StockJournalVo::getToWarehouseId, (item, warehouse) -> {
-//            item.setToWarehouseName(warehouse.getName());
-//        });
         return page;
     }
 

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo">
         SELECT
             sjd.id,
+            sj.id stockJournalId,
             sj.op_type,
             sj.type,
             sj.`code`,