流水待出入库添加搜索条件

hx-iot/src/main/java/com/fjhx/iot/entity/tda/po/TdaDevice.java

@@ -1,6 +1,7 @@
 package com.fjhx.iot.entity.tda.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -35,6 +36,7 @@ public class TdaDevice extends BasePo {
     /**
      * 设备出产时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date deviceDeliveryTime;
     /**
      * 制造商名称

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;
@@ -43,11 +44,22 @@ 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);
+
+        //关键字检索
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            List<Long> pIds = productInfoService.listObject(ProductInfo::getId, q -> q
+                    .like(ProductInfo::getCode, dto.getKeyword())
+                    .like(ProductInfo::getName, dto.getKeyword())
+            );
+            wrapper.and(q -> q
+                    .in("sjd.product_id", pIds)
+                    .or().like("w.name", dto.getKeyword())
+                    .or().like("sj.code", dto.getKeyword())
+            );
+        }
 
         //权限过滤：出入库流水-子公司看自己，总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
@@ -77,6 +89,8 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
             }
         }
 
+        wrapper.orderByDesc("sj", StockJournal::getCreateTime);
+
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

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

@@ -46,10 +46,17 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     @Override
     public Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto) {
         IWrapper<StockWaitDetails> wrapper = getWrapper();
-        wrapper.orderByDesc("swd", StockWaitDetails::getId);
         wrapper.eq("sw", StockWait::getType, dto.getType());
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-            wrapper.and(q -> q.like(StockWaitDetails::getQuantity, dto.getKeyword()).or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword()));
+            List<Long> pIds = productInfoService.listObject(ProductInfo::getId, q -> q
+                    .like(ProductInfo::getCode, dto.getKeyword())
+                    .like(ProductInfo::getName, dto.getKeyword())
+            );
+            wrapper.and(q -> q
+                    .in("swd.product_id", pIds)
+                    .like(StockWaitDetails::getQuantity, dto.getKeyword())
+                    .or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword())
+            );
         }
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
 
@@ -59,6 +66,8 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
             wrapper.eq("swd", StockWait::getStatus, dto.getStatus());
         }
 
+        wrapper.orderByDesc("swd", StockWaitDetails::getId);
+
         Page<StockWaitDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockWaitDetailsVo> records = page.getRecords();
         for (StockWaitDetailsVo record : records) {