From 6809bb47ecce08f3b53a879600ec36fb046b2432 Mon Sep 17 00:00:00 2001
From: zzs <hi@lnbiuc.copm>
Date: Mon, 25 Nov 2024 15:30:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=94=9F=E6=88=90=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=8F=96=E5=80=BC=E6=96=AD=E7=82=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/GenerateReplaceRelationshipTaskEdit.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
index 200eb1e6..fbb1572e 100644
--- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
+++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
@@ -360,8 +360,18 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
                 detailPartNo = d.getString("yem_textfield");
             }
 
-            if (partno.equals(detailPartNo)) {
-                return d.getDate("yem_invoktime");
+            if (partno.lastIndexOf("-") != -1) {
+                partno = partno.substring(0, partno.lastIndexOf("-")).trim();
+            }
+
+            if (YEM.isNotEmpty(detailPartNo)) {
+                detailPartNo = detailPartNo.trim();
+            }
+
+            if (YEM.isNotEmpty(detailPartNo) && YEM.isNotEmpty(partno)) {
+                if (StringUtils.containsIgnoreCase(detailPartNo, partno)) {
+                    return d.getDate("yem_invoktime");
+                }
             }
         }
         return null;