From a8367fa42d18c40407408c79e8a5fd32cd09f05c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 21 四月 2026 11:21:03 +0800
Subject: [PATCH] 更新WMS接口文档，添加修改出入口站台类型接口，优化接口日志记录方法
---
项目资料/与上游系统接口清单/wms接口文档3-10(1).xlsx | 0
/dev/null | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs | 16 ++++++-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs | 18 +++------
项目资料/与上游系统接口清单/接口地址.xlsx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 5 --
项目资料/与上游系统接口清单/WMS接口对接文档_V20260421.docx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 1
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 12 ++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpStationTypeDTO.cs | 29 ++++++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 16 +++++++
11 files changed, 77 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs"
index 8582483..f856096 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs"
@@ -10,6 +10,7 @@
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.RGV.FOURBOT;
+using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_Model.Models;
@@ -55,15 +56,24 @@
}
else if (apiInfo.Remark.Contains("鍑箰澹�"))
{
-
+ GALAXISReturn gALAXISReturn = response.DeserializeObject<GALAXISReturn>();
+ if (gALAXISReturn == null) throw new Exception($"{apiInfo.Remark}鍝嶅簲鍐呭杞崲瀹炰綋澶辫触");
+ if (gALAXISReturn.data.returnStatus != 0) throw new Exception(gALAXISReturn.data.returnInfo);
+ content.Data = gALAXISReturn;
}
else if (apiInfo.Remark.Contains("娴峰悍"))
{
-
+ HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+ if (hIKROBOTReturn == null) throw new Exception($"{apiInfo.Remark}鍝嶅簲鍐呭杞崲瀹炰綋澶辫触");
+ if (hIKROBOTReturn.code != "SUCCESS") throw new Exception(hIKROBOTReturn.message);
+ content.Data = hIKROBOTReturn;
}
else if (apiInfo.Remark.Contains("WMS"))
{
-
+ WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>();
+ if (wMSReturn == null) throw new Exception($"{apiInfo.Remark}鍝嶅簲鍐呭杞崲瀹炰綋澶辫触");
+ if (wMSReturn.code != 200) throw new Exception(wMSReturn.message);
+ content.Data = wMSReturn;
}
content.OK();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs"
index 7093b05..3041eef 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs"
@@ -6,24 +6,18 @@
namespace WIDESEAWCS_DTO.WMS
{
- public class UpLocationStatusDTO
+ public class UpStationTypeDTO
{
-
/// <summary>
- /// 浠撳簱id
+ /// 绔欏彴绫诲瀷
+ /// 1鍏ュ簱绔欏彴锛�2鍑哄簱绔欏彴锛�3鍑哄叆搴撶珯鍙�
/// </summary>
- public int WarehouseId { get; set; }
+ public int stationType { get; set; }
/// <summary>
- /// 绂佺敤鐘舵�侊紙0 鍚敤锛�3 绂佺敤锛�
+ /// 绔欏彴缂栧彿
/// </summary>
- public int EnableStatus { get; set; }
-
-
- /// <summary>
- /// 璐т綅缂栧彿鍒楄〃
- /// </summary>
- public string[] LocationNubList { get; set; }
+ public string stationCode { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpStationTypeDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpStationTypeDTO.cs"
new file mode 100644
index 0000000..7093b05
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpStationTypeDTO.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
+{
+ public class UpLocationStatusDTO
+ {
+
+ /// <summary>
+ /// 浠撳簱id
+ /// </summary>
+ public int WarehouseId { get; set; }
+
+
+ /// <summary>
+ /// 绂佺敤鐘舵�侊紙0 鍚敤锛�3 绂佺敤锛�
+ /// </summary>
+ public int EnableStatus { get; set; }
+
+
+ /// <summary>
+ /// 璐т綅缂栧彿鍒楄〃
+ /// </summary>
+ public string[] LocationNubList { 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 f2cf933..8404abb 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"
@@ -338,9 +338,6 @@
WebResponseContent PLCAlarmtoWMS(string ErrorMsg);
-
-
-
-
+ WebResponseContent UpStationType(UpStationTypeDTO stationTypeDTO);
}
}
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 999ec40..d1faa53 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"
@@ -47,6 +47,18 @@
}
/// <summary>
+ /// 淇敼鍑哄叆鍙ｇ珯鍙扮被鍨�
+ /// </summary>
+ /// <param name="taskDTOs"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UpStationType"), AllowAnonymous]
+ public WMSReturn UpStationType([FromBody] UpStationTypeDTO stationTypeDTO)
+ {
+ WebResponseContent content = _taskService.UpStationType(stationTypeDTO);
+ return WMSReturnMethod.ReturnWMS(content);
+ }
+
+ /// <summary>
/// 骞冲簱璐т綅涓婁笅鏋跺鍣�
/// </summary>
/// <param name="taskDTOs"></param>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 13f9b2e..ace85be 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -42,6 +42,7 @@
"WMS": {
"ReceiveTask": "WMS涓嬪彂浠诲姟",
"ContainerRequest": "瀹瑰櫒娴佸姩璇锋眰",
+ "UpStationType": "淇敼鍑哄叆鍙ｇ珯鍙扮被鍨�",
"UpOrDownContainer": "骞冲簱璐т綅涓婁笅鏋跺鍣�",
"CancelWMSTask": "WMS鍙栨秷浠诲姟",
"IQCResult": "澶栨缁撴灉鍙嶉",
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 35f50a3..efac0c2 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"
@@ -1427,6 +1427,20 @@
_trackloginfoService.AddTrackLog(wMSContainerFlow, content, "瀹瑰櫒娴佸姩璇锋眰", "", "");
}
}
+ public WebResponseContent UpStationType(UpStationTypeDTO stationTypeDTO)
+ {
+ try
+ {
+ Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == stationTypeDTO.stationCode) ?? throw new Exception($"鏈壘鍒扮珯鍙扮紪鍙枫�恵stationTypeDTO.stationCode}銆戜俊鎭�");
+ stationManger.StationType = stationTypeDTO.stationType;
+ _stationMangerService.Repository.UpdateData(stationManger);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 璐ㄦ缁撴灉鍙嶉
/// </summary>
@@ -1889,7 +1903,7 @@
WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>();
if (wMSReturn == null) throw new Exception("WMS杩斿洖缁撴灉杞崲澶辫触锛�");
if (!wMSReturn.success) throw new Exception(wMSReturn.message);
- return content.OK();
+ return content.OK();
}
catch (Exception ex)
{
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.4.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.4.docx"
deleted file mode 100644
index 93c879a..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.4.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V20260421.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V20260421.docx"
new file mode 100644
index 0000000..b855e48
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V20260421.docx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V2026324.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V2026324.docx"
deleted file mode 100644
index 84cd017..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V2026324.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V260318.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V260318.docx"
deleted file mode 100644
index 48af0b5..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V260318.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/wms\346\216\245\345\217\243\346\226\207\346\241\2433-10\0501\051.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/wms\346\216\245\345\217\243\346\226\207\346\241\2433-10\0501\051.xlsx"
index 78ec2c7..b31cfe8 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/wms\346\216\245\345\217\243\346\226\207\346\241\2433-10\0501\051.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/wms\346\216\245\345\217\243\346\226\207\346\241\2433-10\0501\051.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/\346\216\245\345\217\243\345\234\260\345\235\200.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/\346\216\245\345\217\243\345\234\260\345\235\200.xlsx"
index 0533914..b0a63f5 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/\346\216\245\345\217\243\345\234\260\345\235\200.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/\346\216\245\345\217\243\345\234\260\345\235\200.xlsx"
Binary files differ
--
Gitblit v1.9.3