Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs

@@ -22,22 +22,15 @@
    [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)
        public MesController(IOutboundService outboundService, ITaskService taskService)
        {
            _purchaseOrderRepository = purchaseOrderRepository;
            _purchaseOrderService = purchaseOrderService;
            _supplierInfoService = supplierInfoService;
            _materielInfoService = materielInfoService;
            _outboundOrderService = outboundOrderService;
            _outboundService = outboundService;
            _taskService = taskService;
        }

        /// <summary>
        /// æŽ¥æ”¶MES测试架出库
        /// </summary>
@@ -48,6 +41,7 @@
        {
            return _taskService.TestToolOut(model.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶MES测试架退库
        /// </summary>
@@ -58,6 +52,7 @@
        {
            return _taskService.TestToolBack(model.Content);
        }

        /// <summary>
        /// æµ‹è¯•æž¶æŠ¥åºŸ
        /// </summary>
@@ -68,15 +63,49 @@
        {
            return _taskService.TestScrap(model.Content);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="toolSynInfo"></param>
        /// <returns></returns>
        [HttpPost, Route("TestSynStock"), AllowAnonymous]
        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>
        /// ç‰©æ–™å‡ºåº“，WMS同步出库物料批次至MES
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("UploadMesMaterialLotaAcept"), AllowAnonymous]
        public WebResponseContent UploadMesMaterialLotaAcept([FromBody] MesMaterialLotaAceptModel model)
        {
            return _taskService.UploadMesMaterialLotaAcept(model);
        }
    }
}