From 7d410c1f0d4e36f8281ce2277f355c9abf1c231b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:36 +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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
index 021aa9d..af07b4e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
@@ -1,12 +1,16 @@
锘縰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.Dtos.WmsStore;
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;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Controller
{
@@ -65,5 +69,49 @@
{
return await _wmsEnumAppService.GetAreaListAsync();
}
+
+ /// <summary>
+ /// 宸烽亾鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("AisleList")]
+ public async Task<List<PlaceAisleForListOuptut>> GetAisleListAsync()
+ {
+ 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);
+ }
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绫诲瀷鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("MaterialTypeList")]
+ public async Task<List<MaterialTypeOutput>> GetMaterialTypeListAsync()
+ {
+ return await _wmsEnumAppService.GetMaterialTypeListAsync();
+ }
}
}
--
Gitblit v1.9.3