From df643a8e4e593f17096003bdcb9aa10cd47dcc9b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 29 May 2026 11:15:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mes/eqp):=20=E5=B0=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=A4=87=E4=BB=B6=E7=9A=84=E4=BA=A7=E7=BA=BF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=95=BF=E6=95=B4=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 在EqpEquipmentPart实体类、Bo和Vo中将productionLine字段类型由String改为Long
2. 在EqpEquipmentPartServiceImpl的查询条件中，将字符串非空判断改为Long非空判断
3. 统一前后端数据类型，为后续关联产线主键做准备
---
 .../src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java  | 2 +-
 .../main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java | 2 +-
 .../main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java | 2 +-
 .../klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java
index 630373d2..cee193a1 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java
@@ -31,7 +31,7 @@ public class EqpEquipmentPart extends BaseEntity {
     /**
      * 产线
      */
-    private String productionLine;
+    private Long productionLine;
     /**
      * 产线段
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java
index 8dab0af3..928c8229 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java
@@ -31,7 +31,7 @@ public class EqpEquipmentPartBo extends BaseEntity {
     /**
      * 产线
      */
-    private String productionLine;
+    private Long productionLine;
 
     /**
      * 产线段
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java
index b1a6c416..3f3fdeeb 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java
@@ -37,7 +37,7 @@ public class EqpEquipmentPartVo {
      * 产线
      */
     @ExcelProperty(value = "产线")
-    private String productionLine;
+    private Long productionLine;
 
     /**
      * 产线段
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java
index 92fa3ccc..ce25f8bd 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java
@@ -82,7 +82,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<EqpEquipmentPart> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
-        lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine());
+        lqw.eq(bo.getProductionLine() != null, EqpEquipmentPart::getProductionLine, bo.getProductionLine());
         lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
         lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson());
         return lqw;