From 4d71a2e6e1c24d074490895d970cb64bedafd464 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Fri, 8 May 2026 19:11:19 +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=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=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   |  5 +++++
 .../api/domain/ErpEnterpriseUnitDTO.java      | 22 +++++++++++++++++++
 .../RemoteOmsFeignFallbackFactory.java        |  5 +++++
 .../materialBaseInfo/MaterialBaseInfoApi.java | 12 ++++++++++
 .../ErpEnterpriseUnitApi.java                 |  8 +++++++
 5 files changed, 52 insertions(+)
 create mode 100644 mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpEnterpriseUnitDTO.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 74b14a737..783cb3508 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
@@ -8,6 +8,7 @@ import com.mhd.system.api.factory.RemoteOmsFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -35,4 +36,8 @@ public interface OmsServiceFeign {
     @ApiOperation("编辑物料库存")
     @PostMapping("/materialInventoryApi/omsEdit")
     public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
+
+    @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
+    @GetMapping("/erpEnterpriseUnitApi/unitList")
+    public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO);
 }
\ No newline at end of file
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpEnterpriseUnitDTO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpEnterpriseUnitDTO.java
new file mode 100644
index 000000000..f30e6662d
--- /dev/null
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpEnterpriseUnitDTO.java
@@ -0,0 +1,22 @@
+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 ErpEnterpriseUnitDTO {
+
+    @ApiModelProperty("企业单位id")
+    private Long id;
+
+    @ApiModelProperty("企业单位名称")
+    private String erpName;
+
+    @ApiModelProperty("企业单位编码")
+    private String erpCode;
+
+    @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 ff04d9baf..caf15aa6e 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
@@ -53,6 +53,11 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
             public AjaxResult omsEdit(MaterialInventoryOmsParamDO materialInventoryOmsParamDO) {
                 return null;
             }
+
+            @Override
+            public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
+                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 4286d6293..dcefe2d46 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
@@ -5,6 +5,8 @@ import com.mhd.basic.interfaces.vo.MaterialStockInfoVo;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.mhd.system.api.OmsServiceFeign;
+import com.mhd.system.api.domain.ErpEnterpriseUnitDTO;
 import com.mhd.system.api.domain.MaterialBarCodeFeign;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,9 @@ public class MaterialBaseInfoApi extends BaseController{
     @Resource
     private MaterialBaseInfoAssembler materialBaseInfoAssembler;
 
+    @Resource
+    private OmsServiceFeign omsServiceFeign;
+
     /**
      * 分页查询物料基础信息列表
      */
@@ -108,4 +113,11 @@ public class MaterialBaseInfoApi extends BaseController{
         return R.ok(materialBaseInfoApplicationService.getMaterialStockList(shipperName,materialName,machineCode,pageNum,pageSize));
     }
 
+
+    @ApiOperation("获取企业单位列表-申报单位下拉框用")
+    @GetMapping("/getDeclarationUnitList")
+    public AjaxResult getDeclarationUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
+        return omsServiceFeign.getUnitList(erpEnterpriseUnitDTO);
+    }
+
 }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java
index 025e34fb3..2ff5a1071 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java
@@ -6,6 +6,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.oms.application.service.erpEnterpriseUnit.ErpEnterpriseUnitApplicationService;
 import com.mhd.oms.domain.erpEnterpriseUnit.entity.ErpEnterpriseUnit;
+import com.mhd.oms.domain.erpEnterpriseUnit.repository.po.ErpEnterpriseUnitPO;
 import com.mhd.oms.domain.erpEnterpriseUnit.repository.todo.ErpEnterpriseUnitDO;
 import com.mhd.oms.interfaces.assembler.erpEnterpriseUnit.ErpEnterpriseUnitAssembler;
 import com.mhd.oms.interfaces.dto.erpEnterpriseUnit.ErpEnterpriseUnitDTO;
@@ -82,5 +83,12 @@ public class ErpEnterpriseUnitApi extends BaseController {
         return AjaxResult.success(erpEnterpriseUnit);
     }
 
+    @ApiOperation("查询企业单位列表-下拉框用")
+    @GetMapping("/unitList")
+    public AjaxResult unitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
+        ErpEnterpriseUnitDO erpEnterpriseUnitDO = erpEnterpriseUnitAssembler.toDO(erpEnterpriseUnitDTO);
+        TableDataInfo tableDataInfo = erpEnterpriseUnitApplicationService.queryList(erpEnterpriseUnitDO);
+        return AjaxResult.success(tableDataInfo.getData());
+    }
 
 }