From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index a3e3666..978f082 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -9,6 +9,7 @@
using WIDESEA_Core.BaseController;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.System;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -29,6 +30,16 @@
}
/// <summary>
+ /// 鑾峰彇鏃MS绯荤粺杈呮枡浠撳簱瀛�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("GetContainerInfo"), AllowAnonymous]
+ public WebResponseContent GetContainerInfo()
+ {
+ return Service.GetContainerInfo();
+ }
+
+ /// <summary>
/// 鍒濆鍖栬揣浣�
/// </summary>
/// <param name="initializationLocationDTO"></param>
@@ -46,9 +57,9 @@
/// <param name="palletType"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
- public Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId)
+ public Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId, int heightType)
{
- return Service.AssignLocation(roadwayNo, palletType, warehouseId);
+ return Service.AssignLocation(roadwayNo, palletType, warehouseId, heightType: heightType);
}
/// <summary>
@@ -86,5 +97,18 @@
return WebResponseContent.Instance.Error(e.Message);
}
}
+ [HttpPost, Route("GetLocationRoadway"), AllowAnonymous]
+ public WebResponseContent GetLocationRoadway()
+ {
+ try
+ {
+ List<DictionaryDTO> dictionaryDTOs = Service.Repository.QueryData().GroupBy(x => new { x.RoadwayNo, x.WarehouseId }).Select(x => new DictionaryDTO { Key = x.Key.WarehouseId, Value = x.Key.RoadwayNo }).ToList() ;
+ return WebResponseContent.Instance.OK(data: dictionaryDTOs);
+ }
+ catch (Exception e)
+ {
+ return WebResponseContent.Instance.Error(e.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3