From fdb9e49a3ba2c5d10f0005fa7926a33e28108ec8 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@DESKTOP-5BIMHQ3> Date: 星期六, 24 二月 2024 11:18:37 +0800 Subject: [PATCH] Merge branch 'wxw' --- Wms/Wms/Controllers/PdaCrController.cs | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs index 0affd43..da4c8d6 100644 --- a/Wms/Wms/Controllers/PdaCrController.cs +++ b/Wms/Wms/Controllers/PdaCrController.cs @@ -9,6 +9,7 @@ using Model.ModelVm.PdaVm; using WMS.IBLL.IPdaServer; using WMS.Entity.DataEntity; +using WMS.Entity.SysEntity; namespace Wms.Controllers { @@ -236,5 +237,48 @@ #endregion + #region AGV杞繍 + /// <summary> + /// 鑾峰彇鎵樼洏鎵�鍦ㄥ偍浣嶅湴鍧� + /// </summary> + /// <param name="palletNo"></param> + /// <returns></returns> + [HttpGet] + public IActionResult GetPalletLocatNo(string palletNo) + { + try + { + string result = _pdaCrSvc.GetPalletLocatNo(palletNo); + + return Ok(new { data = result, code = 0, msg = "鎴愬姛" }); + } + catch (Exception e) + { + return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" }); + } + + } + /// <summary> + /// 鑾峰彇鎵樼洏鎵�鍦ㄦゼ灞傛墍鏈夊尯鍩� + /// </summary> + /// <param name="palletNo"></param> + /// <returns></returns> + [HttpGet] + public IActionResult GetStorageArea(string palletNo) + { + try + { + List<SysStorageArea> result = _pdaCrSvc.GetStorageArea(palletNo); + + return Ok(new { data = result, code = 0, msg = "鎴愬姛" }); + } + catch (Exception e) + { + return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" }); + } + + } + #endregion + } } -- Gitblit v1.8.0