diff --git a/klp-ems/src/main/java/com/klp/ems/domain/EmsMeter.java b/klp-ems/src/main/java/com/klp/ems/domain/EmsMeter.java
index 2053ce60..af1ae64e 100644
--- a/klp-ems/src/main/java/com/klp/ems/domain/EmsMeter.java
+++ b/klp-ems/src/main/java/com/klp/ems/domain/EmsMeter.java
@@ -72,5 +72,13 @@ public class EmsMeter extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 产线（如：S1、S2、组装线、包装线等）
+     */
+    private String productionLine;
+    /**
+     * 是否总表：0=否，1=是
+     */
+    private Integer isTotalMeter;
 
 }
diff --git a/klp-ems/src/main/java/com/klp/ems/domain/bo/EmsMeterBo.java b/klp-ems/src/main/java/com/klp/ems/domain/bo/EmsMeterBo.java
index 0354a5c0..8c80af64 100644
--- a/klp-ems/src/main/java/com/klp/ems/domain/bo/EmsMeterBo.java
+++ b/klp-ems/src/main/java/com/klp/ems/domain/bo/EmsMeterBo.java
@@ -75,5 +75,15 @@ public class EmsMeterBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 产线（如：S1、S2、组装线、包装线等）
+     */
+    private String productionLine;
+
+    /**
+     * 是否总表：0=否，1=是
+     */
+    private Integer isTotalMeter;
+
 
 }
diff --git a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsMeterVo.java b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsMeterVo.java
index 1c6eb831..dddc36d8 100644
--- a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsMeterVo.java
+++ b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsMeterVo.java
@@ -89,6 +89,18 @@ public class EmsMeterVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 产线（如：S1、S2、组装线、包装线等）
+     */
+    @ExcelProperty(value = "产线")
+    private String productionLine;
+
+    /**
+     * 是否总表：0=否，1=是
+     */
+    @ExcelProperty(value = "是否总表")
+    private Integer isTotalMeter;
+
     /**
      * 库区ID
      */
diff --git a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsMeterServiceImpl.java b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsMeterServiceImpl.java
index cdf095e3..ff13a6cc 100644
--- a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsMeterServiceImpl.java
+++ b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsMeterServiceImpl.java
@@ -93,6 +93,8 @@ public class EmsMeterServiceImpl implements IEmsMeterService {
         lqw.eq(bo.getStatus() != null, EmsMeter::getStatus, bo.getStatus());
         lqw.eq(bo.getLastCalibrationDate() != null, EmsMeter::getLastCalibrationDate, bo.getLastCalibrationDate());
         lqw.eq(bo.getThresholdValue() != null, EmsMeter::getThresholdValue, bo.getThresholdValue());
+        lqw.like(StringUtils.isNotBlank(bo.getProductionLine()), EmsMeter::getProductionLine, bo.getProductionLine());
+        lqw.eq(bo.getIsTotalMeter() != null, EmsMeter::getIsTotalMeter, bo.getIsTotalMeter());
         return lqw;
     }
 
diff --git a/klp-ems/src/main/resources/mapper/EmsMeterMapper.xml b/klp-ems/src/main/resources/mapper/EmsMeterMapper.xml
index 2768748e..d149eaf3 100644
--- a/klp-ems/src/main/resources/mapper/EmsMeterMapper.xml
+++ b/klp-ems/src/main/resources/mapper/EmsMeterMapper.xml
@@ -21,6 +21,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="productionLine" column="production_line"/>
+        <result property="isTotalMeter" column="is_total_meter"/>
     </resultMap>
 
     <resultMap type="com.klp.ems.domain.vo.EmsMeterVo" id="EmsMeterVoResult">
@@ -35,6 +37,8 @@
         <result property="lastCalibrationDate" column="last_calibration_date"/>
         <result property="thresholdValue" column="threshold_value"/>
         <result property="remark" column="remark"/>
+        <result property="productionLine" column="production_line"/>
+        <result property="isTotalMeter" column="is_total_meter"/>
         <result property="warehouseId" column="warehouse_id"/>
         <result property="warehouseName" column="warehouse_name"/>
     </resultMap>
@@ -77,6 +81,8 @@
             m.last_calibration_date,
             m.threshold_value,
             m.remark,
+            m.production_line,
+            m.is_total_meter,
             COALESCE(w.warehouse_id, 0) as warehouse_id,
             COALESCE(w.warehouse_name, '') as warehouse_name
         FROM ems_meter m
@@ -95,6 +101,12 @@
         <if test="status != null">
             AND m.status = #{status}
         </if>
+        <if test="productionLine != null and productionLine != ''">
+            AND m.production_line LIKE CONCAT('%', #{productionLine}, '%')
+        </if>
+        <if test="isTotalMeter != null">
+            AND m.is_total_meter = #{isTotalMeter}
+        </if>
     </select>
 
     <select id="selectMeterIds" parameterType="com.klp.ems.domain.bo.MeterFilterBo" resultType="java.lang.Long">