From f5b4b6acd1fef1a0276566acc134742f7a87abb3 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Sat, 9 May 2026 10:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mhd/system/api/OmsServiceFeign.java   |  4 ++++
 .../mhd/system/api/domain/ErpCountryDTO.java  | 24 +++++++++++++++++++
 .../RemoteOmsFeignFallbackFactory.java        |  5 ++++
 .../materialBaseInfo/MaterialBaseInfoApi.java |  6 +++++
 .../facade/erpCountry/ErpCountryApi.java      |  7 ++++++
 5 files changed, 46 insertions(+)
 create mode 100644 mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpCountryDTO.java

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index 783cb3508..dc0d1f3f3 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -40,4 +40,8 @@ public interface OmsServiceFeign {
     @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
     @GetMapping("/erpEnterpriseUnitApi/unitList")
     public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO);
+
+    @ApiOperation("查询企业国别列表-新增物料时显示下拉框数据")
+    @GetMapping("/erpCountryApi/countryList")
+    public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO);
 }
\ No newline at end of file
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpCountryDTO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpCountryDTO.java
new file mode 100644
index 000000000..3280adbe0
--- /dev/null
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpCountryDTO.java
@@ -0,0 +1,24 @@
+package com.mhd.system.api.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "企业国别DTO")
+public class ErpCountryDTO {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("ERP国别编码")
+    private String erpCountryCode;
+
+    @ApiModelProperty("ERP国别名称")
+    private String erpCountryName;
+
+    @ApiModelProperty("所属组织ID")
+    private Long organizationId;
+
+}
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
index caf15aa6e..1eef3e4da 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
@@ -58,6 +58,11 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
             public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
                 return null;
             }
+
+            @Override
+            public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO) {
+                return null;
+            }
         };
     }
 }
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
index dcefe2d46..bd6a1d37b 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.mhd.system.api.OmsServiceFeign;
+import com.mhd.system.api.domain.ErpCountryDTO;
 import com.mhd.system.api.domain.ErpEnterpriseUnitDTO;
 import com.mhd.system.api.domain.MaterialBarCodeFeign;
 import io.swagger.annotations.ApiOperation;
@@ -120,4 +121,9 @@ public class MaterialBaseInfoApi extends BaseController{
         return omsServiceFeign.getUnitList(erpEnterpriseUnitDTO);
     }
 
+    @ApiOperation("获取企业国别列表-原产国下拉框用")
+    @GetMapping("/getCountryList")
+    public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO) {
+        return omsServiceFeign.getCountryList(erpCountryDTO);
+    }
 }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
index fb5c8beb2..dd5e79990 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
@@ -70,4 +70,11 @@ public class ErpCountryApi extends BaseController{
         return AjaxResult.success(erpCountry);
     }
 
+    @ApiOperation("查询企业国别列表-下拉框用")
+    @GetMapping("/countryList")
+    public AjaxResult countryList(ErpCountryDTO erpCountryDTO){
+        TableDataInfo tableDataInfo = erpCountryApplicationService.queryList(erpCountryDTO);
+        return AjaxResult.success(tableDataInfo.getData());
+    }
+
 }