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;