1

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${AMSFEIGN_URL:localhost:8079}
+#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${TMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1335,6 +1335,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(t.prod_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
         </where>
         union all
         select '' as "prodCodePk",
@@ -1366,6 +1369,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(b.material_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
             <if test="materialId != null and materialId != ''">
                 and REGEXP_LIKE(b.material_id, #{materialId})
             </if>