添加搜索条件，补产品信息字段

hx-mes/src/main/java/com/fjhx/mes/entity/report/vo/ReportLossesDetailsVo.java

@@ -4,6 +4,8 @@ import com.fjhx.mes.entity.report.po.ReportLossesDetails;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 报损管理列表查询返回值实体
  *
@@ -22,6 +24,18 @@ public class ReportLossesDetailsVo extends ReportLossesDetails {
      * 物品编号
      */
     private String materialCode;
+    /**
+     * 物品长
+     */
+    private BigDecimal materialLength;
+    /**
+     * 物品宽
+     */
+    private BigDecimal materialWidth;
+    /**
+     * 物品高
+     */
+    private BigDecimal materialHeight;
 
     /**
      * 生产订单号

hx-mes/src/main/java/com/fjhx/mes/service/report/impl/ReportLossesDetailsServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.report.dto.ReportLossesDetailsDto;
 import com.fjhx.mes.entity.report.dto.ReportLossesDetailsSelectDto;
@@ -53,8 +54,26 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
         wrapper.eq("rld", ReportLossesDetailsVo::getType, dto.getType());
 
         //近n天过滤
-        wrapper.ge("DATEDIFF(NOW(),rld.repo_time)", 0);
-        wrapper.le("DATEDIFF(NOW(),rld.repo_time)", dto.getPastDay());
+        Integer pastDay = dto.getPastDay();
+        if (ObjectUtil.isNotEmpty(pastDay)) {
+            wrapper.ge("DATEDIFF(NOW(),rld.repo_time)", 0);
+            wrapper.le("DATEDIFF(NOW(),rld.repo_time)", pastDay);
+        }
+
+
+        //关键字检索
+        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("rld.repo_time", dto.getKeyword())
+                    .or().like("po.code", dto.getKeyword())
+            );
+        }
+
 
         wrapper.groupBy("rld.id");
 
@@ -70,6 +89,9 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
         productInfoService.attributeAssign(records, ReportLossesDetailsVo::getMaterialId, (item, product) -> {
             item.setMaterialCode(product.getCustomCode());
             item.setMaterialName(product.getName());
+            item.setMaterialLength(product.getLength());
+            item.setMaterialWidth(product.getWidth());
+            item.setMaterialHeight(product.getHeight());
         });
 
         return page;

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

@@ -131,4 +131,8 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      * 备注
      */
     private String remarks;
+
+    private BigDecimal productLength;
+    private BigDecimal productWidth;
+    private BigDecimal productHeight;
 }

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

@@ -141,11 +141,15 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         List<StockJournalDetailsVo> stockJournalDetailsVos = BeanUtil.copyToList(stockJournalDetailsList, StockJournalDetailsVo.class);
         //赋值产品信息
         productInfoService.attributeAssign(stockJournalDetailsVos, StockJournalDetailsVo::getProductId, (item, productInfo) -> {
-            item.setProductCode(productInfo.getCode());
+            item.setProductCode(productInfo.getCustomCode());
             item.setProductUnit(productInfo.getUnit());
             item.setProductType(productInfo.getType());
             item.setProductName(productInfo.getName());
             item.setProductSpec(productInfo.getSpec());
+
+            item.setProductLength(productInfo.getLength());
+            item.setProductWidth(productInfo.getWidth());
+            item.setProductHeight(productInfo.getHeight());
         });
         stockJournalVo.setList(stockJournalDetailsVos);