From cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 20 五月 2024 08:51:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong
---
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToWms/ToWMSController.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToWms/ToWMSController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToWms/ToWMSController.cs"
index a486605..8b4d0c3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToWms/ToWMSController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToWms/ToWMSController.cs"
@@ -12,7 +12,10 @@
public class ToWMSController : ControllerBase
{
private static readonly object OutsourceInboundobj = new object();
- private static readonly object agvTransferListbj = new object();
+ private static readonly object Outsourceobj=new object();
+ private static readonly object agvTransferListobj = new object();
+ private static readonly object shiftingparkingobj = new object();
+ private static readonly object GetStationobj = new object();
/// <summary>
/// 绉诲簱锛堟墜鍔紝涓存椂锛�
/// </summary>
@@ -24,22 +27,74 @@
return new ToMesServer().AddToFloat3(request);
}
-
/// <summary>
- /// 澶栧崗绉诲簱
+ /// 绉诲簱澶栧崗
/// </summary>
- /// <param name="request"></param>
+ /// <param name="saveModel"></param>
/// <returns></returns>
[HttpPost, Route("agvTransferList")]
public WebResponseContent agvTransferList([FromBody] SaveModel saveModel)
{
- lock (agvTransferListbj)
+ lock (agvTransferListobj)
{
return new ToMesServer().agvTransferList(saveModel);
}
}
/// <summary>
+ /// 澶栧崗璐т綅鎵爜纭鐗╂枡宸茶鍙栬蛋
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Confirmedcut")]
+ public WebResponseContent Confirmedcut([FromBody] SaveModel saveModel)
+ {
+ return new ToMesServer().Confirmedcut(saveModel);
+ }
+
+ /// <summary>
+ /// 鑾峰彇璐т綅
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [HttpPost, Route("GetStation")]
+ public WebResponseContent GetStation([FromBody] SaveModel saveModel)
+ {
+ lock (GetStationobj)
+ {
+ return new ToMesServer().GetStation(saveModel);
+ }
+ }
+
+ /// <summary>
+ /// 搴撳唴绉诲簱
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [HttpPost, Route("shiftingparking")]
+ public WebResponseContent shiftingparking([FromBody] SaveModel saveModel)
+ {
+ lock (shiftingparkingobj)
+ {
+ return new ToMesServer().shiftingparking(saveModel);
+ }
+ }
+
+ /// <summary>
+ /// 浜哄伐鍑哄簱
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Outsource")]
+ public WebResponseContent Outsource([FromBody] SaveModel saveModel)
+ {
+ lock (Outsourceobj)
+ {
+ return new ToMesServer().Outsource(saveModel);
+ }
+ }
+
+ /// <summary>
/// 澶栧崗鍑哄簱(妫�娴嬩笂鏂�)
/// </summary>
/// <param name="request"></param>
--
Gitblit v1.9.3