基础信息-物料管理-新增页面 添加新下拉框数据

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);
 }

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;
+
+}

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;
+            }
         };
     }
 }

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);
+    }
 }

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());
+    }
+
 }