From d11b1f9c98e8765d3cee15abd4474b0e05a5acbc Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 01 三月 2025 10:33:56 +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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 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 81d9b0f..71651e5 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" @@ -70,7 +70,7 @@ /// <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); } @@ -96,15 +96,69 @@ { 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> + /// 鎴愬搧杩斿伐鎻愬簱 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost,Route("RworkTask"),AllowAnonymous] + public MesResponseContent RworkTask([FromBody] RworkTaskModel model) + { + return _taskService.RworkTask(model); + } + } } -- Gitblit v1.9.3