修改

src/main/resources/application-prod.yml

@@ -34,8 +34,8 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
-#      url: ${RMSFEIGN_URL:localhost:8060}
+#    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+      url: ${RMSFEIGN_URL:172.16.90.202:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:

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

@@ -2277,6 +2277,7 @@
         WGM.GRID_ID                                 "gridId",
         RM.MATERIAL_NAME                            "materialName",
         ROP.OPERATION_POINT_NAME                    "gridName",
+        ROP.OPERATION_POINT_NAME                    "oldGridName",
         WGM.MODEL                                   "model",
         NVL(WGM.ALTERNATE_FIELDS1,NVL(ROP .WAREHOUSE_TYPE,'其他')) "alter1"
         FROM WMS_GRID_MATERIAL WGM
@@ -2285,10 +2286,10 @@
     )
     <where>
         <if test="index != null and index != ''">
-            regexp_like("label",#{index})
+            and regexp_like("label",#{index})
         </if>
         <if test="alter1 != null and alter1 != ''">
-            regexp_like("alter1",#{alter1})
+            and regexp_like("alter1",#{alter1})
         </if>
     </where>
     </select>