From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 18d085b..0c04ed1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -152,17 +152,7 @@
return _taskService.UploadMesMaterialLotaAcept(model);
}
/// <summary>
- /// 鎴愬搧杩斿伐鎻愬簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost,Route("RworkTask"),AllowAnonymous]
- public MesResponseContent RworkTask([FromBody] RworkTaskModel model)
- {
- return _taskService.RworkTask(model);
- }
- /// <summary>
- /// MES鎴愬搧鍏ュ簱鍗曟帴鏀�
+ /// MES鎴愬搧鍐呭寘淇℃伅鎺ユ敹
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -172,6 +162,45 @@
return _taskService.BagInfoSync(model.Content);
}
/// <summary>
+ /// MES鎴愬搧澶栧寘淇℃伅鎺ユ敹
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("BoxStockin"), AllowAnonymous]
+ public MesResponseContent BoxStockin([FromBody] Root<MesBoxInfoModel> model)
+ {
+ return _taskService.BoxStockin(model.Content);
+ }
+ /// <summary>
+ /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ShipmentOrderSync"), AllowAnonymous]
+ public WebResponseContent ShipmentOrderSync([FromBody] MesShipmentOrderSync model)
+ {
+ return _taskService.ShipmentOrderSync(model);
+ }
+ /// <summary>
+ /// 鎴愬搧杩斿伐鎻愬簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost,Route("RworkTask"),AllowAnonymous]
+ public MesResponseContent RworkTask([FromBody] Root<RworkTaskModel> model)
+ {
+ return _taskService.RworkTask(model.Content);
+ }
+ /// <summary>
+ /// 搴撳瓨鏉垮嚭搴撳悓姝ユ帴鍙�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ProductOutBoundSync"), AllowAnonymous]
+ public WebResponseContent ProductOutBoundSync([FromBody] MesProductOutBound model)
+ {
+ return _outboundService.RworkOutboundOrderService.ProductOutBoundSync(model);
+ }
+ /// <summary>
/// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
/// </summary>
/// <param name="keys"></param>
--
Gitblit v1.9.3