From 6528710f86a89a0828c90bd43a29ca455e1a30b0 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 三月 2026 13:45:24 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSGetLocationInfo.cs | 29 ++++++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 4 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 51 ++++++++++++++++++++++---
4 files changed, 76 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSGetLocationInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSGetLocationInfo.cs"
new file mode 100644
index 0000000..f2799f8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSGetLocationInfo.cs"
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_DTO.WMS
+{
+ /// <summary>
+ /// 搴撲綅淇℃伅鏌ヨ
+ /// </summary>
+ public class WMSGetLocationInfo
+ {
+
+ /// <summary>
+ /// 搴撳尯缂栧彿
+ /// </summary>
+ public string AreaCode { get; set; }
+
+ /// <summary>
+ /// 1锛氭垚鍝佸簱
+ /// 2锛氶潰鏂欏簱
+ /// 3:杈撻�佺嚎缂撳瓨
+ /// 4锛氳鍓簱
+ /// 5锛�1妤煎嚭鍏ュ簱绔欏彴
+ /// </summary>
+ public int WarehouseId { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 6412caf..851e4c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -236,7 +236,7 @@
/// </summary>
/// <param name="AreaCode">鍖哄煙鍙�</param>
/// <returns></returns>
- WebResponseContent LocationInquiry(string AreaCode);
+ WebResponseContent LocationInquiry(WMSGetLocationInfo getLocationInfo);
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
index 87e0b50..563e4f3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
@@ -100,9 +100,9 @@
/// <param name="AreaCode">鍖哄煙鍙�</param>
/// <returns></returns>
[HttpGet, HttpPost, Route("QueryStation"), AllowAnonymous]
- public WMSReturn QueryStation(string AreaCode)
+ public WMSReturn QueryStation(WMSGetLocationInfo getLocationInfo)
{
- WebResponseContent content = _taskService.LocationInquiry(AreaCode);
+ WebResponseContent content = _taskService.LocationInquiry(getLocationInfo);
return WMSReturnMethod.ReturnWMS(content);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 6a3b7df..c8eab5b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -148,11 +148,11 @@
objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CPInbound:
- content= CreateRGVNewInTask(task, item.taskType);
+ content = CreateRGVNewInTask(task, item.taskType);
objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CPOutbound:
- content= CreateRGVNewOutTask(task, item.taskType);
+ content = CreateRGVNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CJInbound:
@@ -1067,14 +1067,51 @@
/// <param name="AreaCode"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException">鍖哄煙鍙�</exception>
- public WebResponseContent LocationInquiry(string AreaCode)
+ public WebResponseContent LocationInquiry(WMSGetLocationInfo getLocationInfo)
{
- if (AreaCode == null)
+ WebResponseContent content = new WebResponseContent();
+ List<object> list = new List<object>();
+ try
{
- //鏌ヨ杈撻�佺嚎绌烘墭缂撳瓨淇℃伅鏃惰繑鍥炵┖浣嶆暟閲�
- }
- return WebResponseContent.Instance.OK();
+ if (getLocationInfo == null) throw new Exception("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�");
+ if (getLocationInfo.AreaCode == null) throw new Exception("搴撳尯缂栧彿涓嶈兘涓虹┖锛�");
+ if (getLocationInfo.WarehouseId == 0) throw new Exception("浠撳簱ID涓嶈兘涓虹┖锛�");
+ if (getLocationInfo.WarehouseId == 1)
+ {
+ List<Dt_RGVLocationInfo> rGVLocationInfos = _rGVLocationInfoService.Repository.QueryData(x => x.WarehouseId == getLocationInfo.AreaCode.ObjToInt());
+ foreach (var item in rGVLocationInfos)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.LocationCode,
+ LocationStatus = item.LocationStatus,
+ EnableStatus = item.EnableStatus
+ });
+ }
+ content.Data = list;
+ }
+ else if (getLocationInfo.WarehouseId == 2)
+ {
+ }
+ else if (getLocationInfo.WarehouseId == 3)
+ {
+
+ }
+ else if (getLocationInfo.WarehouseId == 4)
+ {
+
+ }
+ else if (getLocationInfo.WarehouseId == 5)
+ {
+
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
}
--
Gitblit v1.9.3