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 | 255 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 239 insertions(+), 16 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 8e39f2d..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"
@@ -12,6 +12,11 @@
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
using WIDESEA_Core.Helper;
+using Autofac.Core;
+using WIDESEA_DTO.Stock;
+using WIDESEA_External.Model;
+using WIDESEA_External.ERPService;
+using WIDESEA_ICheckService;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -22,22 +27,18 @@
[ApiController]
public class MesController : ControllerBase
{
- private readonly IPurchaseOrderRepository _purchaseOrderRepository;
- private readonly IPurchaseOrderService _purchaseOrderService;
- private readonly ISupplierInfoService _supplierInfoService;
- private readonly IMaterielInfoService _materielInfoService;
- private readonly IOutboundOrderService _outboundOrderService;
+ private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
-
- public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService, ITaskService taskService)
+ private readonly IInvokeERPService _invokeERPService;
+ private readonly ICheckOrderResultService _checkOrderResultService;
+ public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService, ICheckOrderResultService checkOrderResultService)
{
- _purchaseOrderRepository = purchaseOrderRepository;
- _purchaseOrderService = purchaseOrderService;
- _supplierInfoService = supplierInfoService;
- _materielInfoService = materielInfoService;
- _outboundOrderService = outboundOrderService;
+ _outboundService = outboundService;
_taskService = taskService;
+ _invokeERPService = invokeERPService;
+ _checkOrderResultService=checkOrderResultService;
}
+
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋跺嚭搴�
/// </summary>
@@ -49,6 +50,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>
/// <param name="model"></param>
@@ -58,6 +79,7 @@
{
return _taskService.TestToolBack(model.Content);
}
+
/// <summary>
/// 娴嬭瘯鏋舵姤搴�
/// </summary>
@@ -68,15 +90,216 @@
{
return _taskService.TestScrap(model.Content);
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="toolSynInfo"></param>
+ /// <returns></returns>
[HttpPost, Route("TestSynStock"), AllowAnonymous]
- public WebResponseContent TestSynStock([FromBody]TestToolSynInfo toolSynInfo)
+ public WebResponseContent TestSynStock([FromBody] TestToolSynInfo toolSynInfo)
{
return _taskService.TestSynStock(toolSynInfo);
}
- [HttpPost, Route("testHttp"), AllowAnonymous, MethodParamsValidate]
- public string TestScrap(string str)
+
+ /// <summary>
+ /// 鍩烘澘鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SubstrateOut"), AllowAnonymous]
+ public MesResponseContent SubstrateOut([FromBody] Root<SubstrateOutModel> model)
{
- return HttpMesHelper.GetStr(str);
+ return _taskService.SubstrateOut(model.Content);
+ }
+
+ /// <summary>
+ /// 鍩烘澘浣欐枡閫�搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SubstrateBack"), AllowAnonymous]
+ public MesResponseContent SubstrateBack([FromBody] Root<SubstrateBackModel> model)
+ {
+ return _taskService.SubstrateBack(model.Content);
+ }
+ /// <summary>
+ /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPSubsectionOut"), AllowAnonymous]
+ public MesResponseContent PPSubsectionOut([FromBody] Root<PPSubsectionOutModel> model)
+ {
+ return _taskService.PPSubsectionOut(model.Content);
+ }
+ /// <summary>
+ /// PP灏忓嵎鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPCutOut"), AllowAnonymous]
+ public MesResponseContent PPCutOut([FromBody] Root<PPCutOutModle> model)
+ {
+ return _taskService.PPCutOut(model.Content);
+ }
+
+ /// <summary>
+ /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPBack"), AllowAnonymous]
+ public MesResponseContent PPBack([FromBody] Root<PPBackModel> model)
+ {
+ return _taskService.PPBack(model.Content);
+ }
+
+ /// <summary>
+ /// PP搴撳瓨鏌ヨ
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("QueryPpByWidth"), AllowAnonymous]
+ public MesResponseContent QueryPpByWidth([FromBody] Root<QueryPpByWidthModel> model)
+ {
+ return _taskService.QueryPpByWidth(model.Content);
+ }
+
+ /// <summary>
+ /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UploadMesMaterialLotaAcept"), AllowAnonymous]
+ public WebResponseContent UploadMesMaterialLotaAcept([FromBody] MesMaterialLotaAceptModel model)
+ {
+ return _taskService.UploadMesMaterialLotaAcept(model);
+ }
+ /// <summary>
+ /// MES鎴愬搧鍐呭寘淇℃伅鎺ユ敹
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("BagInfoSync"), AllowAnonymous]
+ public MesResponseContent BagInfoSync([FromBody] Root<MesBagInfoModel> model)
+ {
+ return _taskService.BagInfoSync(model.Content, model.From!="PK" ? "" : model.From);
+ }
+ /// <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>
+ /// 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>
+ /// 鎴愬搧杩斿伐鎻愬簱
+ /// </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>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
+ public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
+ {
+ return _taskService.MESPPGenerateOutboundTasks(keys);
+ }
+
+ /// <summary>
+ /// 鐢熸垚MESPP浠撳皬鍗峰嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ //[HttpPost, HttpGet, Route("PPCutOutGenerateOutboundTasks"), AllowAnonymous]
+ //public WebResponseContent PPCutOutGenerateOutboundTasks([FromBody] int[] keys)
+ //{
+ // return _taskService.PPCutOutGenerateOutboundTasks(keys);
+ //}
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PPCutOutGenerateOutboundTasks"), AllowAnonymous]
+ public WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, [FromBody] List<PPStockSelectViewDTO> stockSelectViews)
+ {
+ return _taskService.PPCutOutGenerateOutboundTasks(orderDetailId, stockSelectViews);
+ }
+
+ /// <summary>
+ /// PP骞冲簱鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PPGeneratePKOutboundTask"), AllowAnonymous]
+ public WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, [FromBody] List<PPStockSelectViewDTO> stockSelectViews)
+ {
+ return _taskService.PPGeneratePKOutboundTask(orderDetailId, stockSelectViews);
+ }
+ /// <summary>
+ /// 妫�楠屽崟鍥炰紶鏇存柊
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel> 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)
+ {
+ return MesResponseContent.Instance.Error(requestContent.Data);
+ }
+ return MesResponseContent.Instance.OK("鎴愬姛");
}
}
}
--
Gitblit v1.9.3