Merge branch 'dev' into dev_WMS20260401

# Conflicts:
#	mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java

@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017",  configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {
 
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java

@@ -369,4 +369,12 @@ public interface SystemServiceFeign {
     @GetMapping("/LeaseApi/wholeRentSynchronization")
     public AjaxResult wholeRentSynchronization();
 
+    /**
+     * 物料主数据导入：按组织与关键词匹配物料分类，返回体含物料分类的 code 字段，供写入 material_base_info.material_classify_code。
+     * 使用 basicApi 前缀，与 WMS 其他 Feign 调 system 的惯例一致（避免仅重启 WMS 时 system 上无 materialClassifyApi 新路由导致 404）。
+     */
+    @GetMapping("/basicApi/matchMaterialClassifyForImport")
+    public AjaxResult matchForMaterialImport(@RequestParam("keyword") String keyword,
+                                            @RequestParam("organizationId") Long organizationId);
+
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java

@@ -298,6 +298,11 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
             public AjaxResult wholeRentSynchronization() {
                 return AjaxResult.error("查询失败");
             }
+
+            @Override
+            public AjaxResult matchForMaterialImport(String keyword, Long organizationId) {
+                return AjaxResult.error("物料分类匹配失败");
+            }
         };
     }
 }