From 9a886d711d8b21adc335fdf8c39350584c7ba6fd Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:14 +0800
Subject: [PATCH] 更新代码，取消MES出库单号同步标识，平库转立库功能，寄售周期判断取消，精品标识等
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 7f37857..f6e80fc 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"
@@ -16,6 +16,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_External.Model;
using WIDESEA_External.ERPService;
+using WIDESEA_ICheckService;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -29,11 +30,13 @@
private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
private readonly IInvokeERPService _invokeERPService;
- public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService)
+ private readonly ICheckOrderResultService _checkOrderResultService;
+ public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService, ICheckOrderResultService checkOrderResultService)
{
_outboundService = outboundService;
_taskService = taskService;
_invokeERPService = invokeERPService;
+ _checkOrderResultService=checkOrderResultService;
}
/// <summary>
@@ -46,7 +49,26 @@
{
return _taskService.TestToolOut(model.Content);
}
-
+ /// <summary>
+ /// 鎺ユ敹MES闃茬剨娲惧伐
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SolderMaskOutNotice"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent SolderMaskOutNotice([FromBody] Root<SolderMaskOutNotice> model)
+ {
+ return _taskService.SolderMaskOutNotice(model.Content);
+ }
+ /// <summary>
+ /// 鎺ユ敹MES闃茬剨鍒扮嚎杈�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SolderMaskOut"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent SolderMaskOut([FromBody] Root<SolderMaskOut> model)
+ {
+ return _taskService.SolderMaskOut(model.Content);
+ }
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
/// </summary>
@@ -162,7 +184,7 @@
[HttpPost, Route("BagInfoSync"), AllowAnonymous]
public MesResponseContent BagInfoSync([FromBody] Root<MesBagInfoModel> model)
{
- return _taskService.BagInfoSync(model.Content);
+ return _taskService.BagInfoSync(model.Content, model.From!="PK" ? "" : model.From);
}
/// <summary>
/// MES鎴愬搧澶栧寘淇℃伅鎺ユ敹
@@ -175,13 +197,22 @@
return _taskService.BoxStockin(model.Content);
}
/// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
+ /// MWMS鍚屾鎴愬搧鍑哄簱淇℃伅鑷矼ES
/// </summary>
/// <returns></returns>
[HttpPost, Route("ShipmentOrderSync"), AllowAnonymous]
public WebResponseContent ShipmentOrderSync([FromBody] MesShipmentOrderSync model)
{
return _taskService.ShipmentOrderSync(model);
+ }
+ /// <summary>
+ /// WMS鍚屾鎴愬搧鍑哄簱淇℃伅鑷矼ES澶栧寘瑁呮満
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ShipmentOrderMESSync"), AllowAnonymous]
+ public WebResponseContent ShipmentOrderMESSync([FromBody] MesShipmentOrderSync model)
+ {
+ return _taskService.ShipmentOrderMESSync(model);
}
/// <summary>
/// 鎴愬搧杩斿伐鎻愬簱
@@ -254,9 +285,15 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model)
+ public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel> model)
{
- string content = _invokeERPService.InvokeCheckOrderApi(model);
+ WebResponseContent responseContent = _checkOrderResultService.CommitCheckResult(model.Content);
+ if (!responseContent.Status)
+ {
+ return MesResponseContent.Instance.Error(responseContent.Message);
+ }
+ model.Content.CreatorCode = "QMS";
+ string content = _invokeERPService.InvokeCheckOrderApi(model.Content);
ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
if (requestContent.res != 1)
{
--
Gitblit v1.9.3