Merge remote-tracking branch 'origin/master'

- 在 ProductInfo 类中添加 serialNumber 字段- 更新 ProductInfoMapper.xml，通过产品代码左连接 delivery_list 表
- 优化查询条件，直接使用 t2.serial_number 进行比较

ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java

@@ -2,6 +2,8 @@ package com.ruoyi.sip.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author mula
  * @date 2025-04-11
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ProductInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -46,99 +50,6 @@ public class ProductInfo extends BaseEntity
 
     /** 删除时间 */
     private Date deletedAt;
+    private String serialNumber;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-
-    public void setProductCode(String productCode) 
-    {
-        this.productCode = productCode;
-    }
-
-    public String getProductCode() 
-    {
-        return productCode;
-    }
-
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName() 
-    {
-        return productName;
-    }
-
-    public void setModel(String model) 
-    {
-        this.model = model;
-    }
-
-    public String getModel() 
-    {
-        return model;
-    }
-
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-
-    public void setCreatedAt(Date createdAt) 
-    {
-        this.createdAt = createdAt;
-    }
-
-    public Date getCreatedAt() 
-    {
-        return createdAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) 
-    {
-        this.updatedAt = updatedAt;
-    }
-
-    public Date getUpdatedAt() 
-    {
-        return updatedAt;
-    }
-
-    public void setDeletedAt(Date deletedAt) 
-    {
-        this.deletedAt = deletedAt;
-    }
-
-    public Date getDeletedAt() 
-    {
-        return deletedAt;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("productCode", getProductCode())
-            .append("productName", getProductName())
-            .append("model", getModel())
-            .append("description", getDescription())
-            .append("remark", getRemark())
-            .append("createdAt", getCreatedAt())
-            .append("updatedAt", getUpdatedAt())
-            .append("deletedAt", getDeletedAt())
-            .toString();
-    }
 }

ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml

@@ -43,13 +43,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
     <select id="query" resultType="com.ruoyi.sip.domain.ProductInfo">
-        <include refid="selectProductInfoVo"/>
+        SELECT
+        t1.id,
+        t1.product_code,
+        t1.product_name,
+        t1.model,
+        t1.description,
+        t1.remark,
+        t1.created_at,
+        t1.updated_at,
+        t1.deleted_at ,
+        t2.serial_number
+        FROM
+        product_info t1  left join delivery_list t2 on t1.product_code=t2.product_code
         <where>
             <if test="serialNumber!=null and serialNumber!=''">
-                and product_code in (select product_code from delivery_list where serial_number=#{serialNumber})
+                and t2.serial_number=#{serialNumber}
             </if>
             <if test="productCode!=null and productCode!=''">
-                and product_code=#{productCode}
+                and t1.product_code=#{productCode}
             </if>
         </where>
     </select>