From 46dc31d4e66e45cde693b9c909691a710fabfcee Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 10 七月 2025 17:31:14 +0800
Subject: [PATCH] mes接口修改
---
api/WmsController.cs | 121 +++++++++------------------------------
1 files changed, 29 insertions(+), 92 deletions(-)
diff --git a/api/WmsController.cs b/api/WmsController.cs
index d5ccd81..d4e2264 100644
--- a/api/WmsController.cs
+++ b/api/WmsController.cs
@@ -26,6 +26,7 @@
/// <param name="jsonData"></param>
/// <returns></returns>
[HttpPost]
+ [Route("api/ZcInWorkArea")]
public Result ZcInWorkArea(ZcInWorkAreaParme model)
{
LogHelper.Info("ZcInWorkArea 鍙傛暟锛� + JsonConvert.SerializeObject(model), "Mes浠诲姟涓嬪彂");
@@ -34,6 +35,20 @@
return res;
}
+ /// <summary>
+ /// 鍛煎彨鑳舵枡
+ /// </summary>
+ /// <param name="jsonData"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/InWorkArea")]
+ public Result InWorkArea(InWorkAreaParme model)
+ {
+ LogHelper.Info("InWorkArea 鍙傛暟锛� + JsonConvert.SerializeObject(model), "Mes浠诲姟涓嬪彂");
+ var res = TaskProcess.addMesTaskInWorkArea(model);
+ LogHelper.Info("InWorkArea 杩斿洖锛� + JsonConvert.SerializeObject(res), "Mes浠诲姟涓嬪彂");
+ return res;
+ }
@@ -43,6 +58,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
+ [Route("api/SendTaskZCMes")]
public Result SendTaskZCMes(PtpTaskParme model)
{
LogHelper.Info("SendTaskZCMes 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐐瑰埌鐐�);
@@ -57,6 +73,7 @@
/// 鍙栨秷浠诲姟
/// </summary>
[HttpPost]
+ [Route("api/CancelTask")]
public Result CancelTask(cancleTaskParme model)
{
LogHelper.Info("cancelTask 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鍙栨秷");
@@ -70,6 +87,7 @@
/// MES鐗╂枡缁戝畾璐т綅鎺ュ彛
/// </summary>
[HttpPost]
+ [Route("api/MesBindUnbind")]
public Result MesBindUnbind(BindUnbindParme model)
{
LogHelper.Info("MesBindUnbind 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
@@ -84,6 +102,7 @@
/// </summary>
/// <returns></returns>
[HttpPost]
+ [Route("api/InventoryRecords")]
public MesAreaSecItemReturn InventoryRecords(MesAreaSecItemParme model)
{
LogHelper.Info("InventoryRecords 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
@@ -97,6 +116,7 @@
/// </summary>
/// <returns></returns>
[HttpPost]
+ [Route("api/MesUdeItem")]
public Result MesUdeItem(MesUdeItemParme model)
{
LogHelper.Info("MesUdeItem 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
@@ -110,101 +130,18 @@
/// 搴撲綅鎿嶄綔璁板綍鎺ュ彛
/// </summary>
/// <returns></returns>
- [HttpPost]
- public Result LocationRecords(MesUdeItemParme model)
- {
- LogHelper.Info("MesUdeItem 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
- var res = TaskProcess.MesUdeItem(model);
- LogHelper.Info("MesUdeItem 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
- return res;
- }
+ //[HttpPost]
+ //public Result LocationRecords(MesUdeItemParme model)
+ //{
+ // LogHelper.Info("MesUdeItem 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
+ // var res = TaskProcess.MesUdeItem(model);
+ // LogHelper.Info("MesUdeItem 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
+ // return res;
+ //}
- //Wcs璋冪敤
-
-
- /// <summary>
- /// Wcs浠诲姟鎵ц閫氱煡
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn WcsOperateTask(WcsOperateTaskParme model)
- {
- LogHelper.Info("WcsOperateTask浠诲姟鎵ц閫氱煡 鍙傛暟锛� + JsonConvert.SerializeObject(model), "Wcs浠诲姟鎵ц閫氱煡 ");
- var res = WcsTask.WcsOperateTask(model);
- LogHelper.Info("WcsOperateTask浠诲姟鎵ц閫氱煡 杩斿洖锛� + JsonConvert.SerializeObject(res), "Wcs浠诲姟鎵ц閫氱煡 ");
- return res;
- }
-
-
- /// <summary>
- /// Wcs鎶ヨ涓婃姤
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn WcsTaskProcessing(WcsWarningParme model)
- {
- LogHelper.Info("WcsTaskProcessing鎶ヨ涓婃姤 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鎶ヨ涓婃姤");
- var res = WcsTask.WcsTaskProcessing(model);
- LogHelper.Info("WcsTaskProcessing鎶ヨ 杩斿洖锛� + JsonConvert.SerializeObject(res), "鎶ヨ涓婃姤");
- return res;
- }
-
-
- /// <summary>
- /// Wcs宸烽亾鍙敤涓婃姤
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn WcsRoadwaystate(WcsRoadwaystateParme model)
- {
- LogHelper.Info("WcsRoadwaystate宸烽亾鍙敤涓婃姤 鍙傛暟锛� + JsonConvert.SerializeObject(model), "宸烽亾鍙敤涓婃姤");
- var res = WcsTask.WcsRoadwaystate(model);
- LogHelper.Info("WcsRoadwaystate宸烽亾鍙敤 杩斿洖锛� + JsonConvert.SerializeObject(res), "宸烽亾鍙敤涓婃姤");
- return res;
- }
-
-
- /// <summary>
- /// Wcs閫氱煡纭锛堜氦浜掔敤锛�- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn agvResponse(agvResponseParme model)
- {
- LogHelper.Info("agvResponse閫氱煡纭 鍙傛暟锛� + JsonConvert.SerializeObject(model), "閫氱煡纭");
- var res = WcsTask.agvResponse(model);
- LogHelper.Info("agvResponse閫氱煡纭 杩斿洖锛� + JsonConvert.SerializeObject(res), "閫氱煡纭");
- return res;
- }
-
-
- /// <summary>
- /// Wcs鏀捐揣鏈夎揣 闇�鏀归亾
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn ZcInChangeBit(changeBitParme model)
- {
- LogHelper.Info("ZcInChangeBit 鏀捐揣鏈夎揣鍙傛暟锛� + JsonConvert.SerializeObject(model), "鏀捐揣鏈夎揣");
- var res = WcsTask.ZcInChangeBit(model);
- LogHelper.Info("ZcInChangeBit 鏀捐揣鏈夎揣杩斿洖锛� + JsonConvert.SerializeObject(res), "鏀捐揣鏈夎揣");
- return res;
- }
-
- /// <summary>
- /// Wcs涓嬪彂浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- public WcsWarningReurn ZcWcsInWorkArea(WcsOperateTaskParme1 model)
- {
- LogHelper.Info("ZcWcsInWorkArea 鍙傛暟锛� + JsonConvert.SerializeObject(model), "Wcs涓嬪彂浠诲姟");
- var res = WcsTask.ZcWcsInWorkArea(model);
- LogHelper.Info("ZcWcsInWorkArea 杩斿洖锛� + JsonConvert.SerializeObject(res), "Wcs涓嬪彂浠诲姟");
- return res;
- }
+
}
}
--
Gitblit v1.9.1