From f0428c0ce5831765142690676d1b337a84e90b8b Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期四, 05 六月 2025 10:23:02 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuSanLouNew
---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
index 5772284..b558462 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -228,11 +228,6 @@
}
/// <summary>
-<<<<<<< HEAD
- /// 鑾峰彇浠诲姟淇℃伅
- /// </summary>
- /// <returns></returns>
-=======
/// 闈欑疆鏌ヨ绌洪棽搴撲綅
/// </summary>
/// <returns></returns>
@@ -242,27 +237,24 @@
return Service.QueryLocationFreeJZ(RoadwayNo);
}
->>>>>>> c2aaf06dab8a627948ee2e5574fe4598f8d1638f
[HttpPost, AllowAnonymous, Route("GetTaskInfo")]
public WebResponseContent GetTaskInfo()
{
return Service.GetTaskInfo();
}
- /// <summary>
- /// 鑾峰彇褰撴棩鍑哄簱搴撳瓨淇℃伅
- /// </summary>
- /// <returns></returns>
[HttpPost, AllowAnonymous, Route("GetStockInfo")]
public WebResponseContent GetStockInfo()
{
return Service.GetStockInfo();
}
+
/// <summary>
/// 鑾峰彇搴撳瓨淇℃伅
/// </summary>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("GetStockQuantity")]
- public WebResponseContent GetStockQuantity() {
+ public WebResponseContent GetStockQuantity()
+ {
return Service.GetStockQuantity();
}
[HttpPost, AllowAnonymous, Route("Getproductionvolume")]
@@ -270,4 +262,23 @@
{
return Service.Getproductionvolume();
}
+ [HttpPost, AllowAnonymous, Route("Getoutput")]
+ public WebResponseContent Getoutput()
+ {
+ return Service.Getoutput();
+ }
+ [HttpPost, AllowAnonymous, Route("GetTimeoutgetPageData")]
+ public WebResponseContent GetTimeout()
+ {
+ return Service.GetTimeout();
+ }
+ /// <summary>
+ /// 浜ч噺缁熻
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("GetproductionstatisticsgetPageData")]
+ public WebResponseContent Getproductionstatistics()
+ {
+ return Service.Getproductionstatistics();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3