From 17c0c88cb5419351e4f0bf498e4b9535c5b39197 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 21:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
index 0305a60..41c7f75 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
@@ -1,8 +1,11 @@
 锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
 using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
 using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
 using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CmsQueryExtensions;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Web;
@@ -77,5 +80,28 @@
         {
             return await _wmsEnumAppService.GetAisleListAsync();
         }
+
+        /// <summary>
+        /// 鑾峰彇鏈哄瀷
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("ModelList")]
+        public async Task<List<MaterialModelOutput>> GetMaterialModeListAsync()
+        {
+           return await  _wmsEnumAppService.GetMaterialModeListAsync();
+        }
+
+        /// <summary>
+        /// 鑾峰彇搴撲綅鍒楄〃
+        /// </summary>
+        /// <param name="placeType"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("PlaceList")]
+        public async Task<List<PlaceListOutput>> GetPlaceListForSelectAsync(PlaceTypeEnum placeType)
+        {
+            return await _wmsEnumAppService.GetPlaceListForSelectAsync(placeType);
+        }
     }
 }

--
Gitblit v1.9.3