From 20dda69cad210c3b40d643e52ba1cbccec24b392 Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 14 七月 2025 15:23:32 +0800 Subject: [PATCH] 1.携客云获取送货单默认组织写死 2.采购入库优化 --- Controllers/Warehouse/MesItemTblController.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 9 deletions(-) diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs index 6a06111..09be511 100644 --- a/Controllers/Warehouse/MesItemTblController.cs +++ b/Controllers/Warehouse/MesItemTblController.cs @@ -8,9 +8,8 @@ namespace NewPdaSqlServer.Controllers.Warehouse; /// <summary> -/// 鐢熶骇閫�鏂欑浉鍏虫帴鍙� +/// 鐢熶骇閫�鏂欑浉鍏虫帴鍙� /// </summary> - [Route("api/[controller]")] [ApiController] public class MesItemTblController : ControllerBase @@ -166,16 +165,16 @@ // 鏂板鐨勬柟娉� /// <summary> - /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛� + /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛� /// </summary> /// <returns>閫�鏂欏崟鍙峰垪琛�</returns> [HttpPost("GetSCTLBillNo")] - public ResponseResult GetSCTLBillNo() + public ResponseResult GetSCTLBillNo(WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); - resultInfos.tbBillList = m.GetSCTLBillNo(); + resultInfos.tbBillList = m.GetSCTLBillNo(query); return new ResponseResult { status = 0, @@ -190,17 +189,29 @@ } /// <summary> - /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇閫�鏂欏崟鏄庣粏 + /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇閫�鏂欏崟鏄庣粏 /// </summary> /// <param name="query">鏌ヨ鍙傛暟</param> /// <returns>閫�鏂欏崟鏄庣粏鍒楄〃</returns> [HttpPost("GetMesItemTblDetailByBillNo")] - public ResponseResult GetMesItemTblDetailByBillNo([FromBody] WarehouseQuery query) + public ResponseResult GetMesItemTblDetailByBillNo( + [FromBody] WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query); + + //if(resultInfos.tbBillList.Count < 1) + //{ + // return new ResponseResult + // { + // status = 1, + // message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�", + // data = "" + // }; + //} + return new ResponseResult { status = 0, @@ -215,7 +226,7 @@ } /// <summary> - /// 鎵弿搴撲綅 + /// 鎵弿搴撲綅 /// </summary> /// <param name="query">鏌ヨ鍙傛暟</param> /// <returns>搴撲綅淇℃伅</returns> @@ -240,7 +251,7 @@ } /// <summary> - /// 鎵弿鏉$爜 + /// 鎵弿鏉$爜 /// </summary> /// <param name="query">鏌ヨ鍙傛暟</param> /// <returns>鎵弿缁撴灉</returns> @@ -263,4 +274,29 @@ return ResponseResult.ResponseError(ex); } } + + /// <summary> + /// 濮斿閫�鏂欐壂鎻忔潯鐮� + /// </summary> + /// <param name="query">鏌ヨ鍙傛暟</param> + /// <returns>鎵弿缁撴灉</returns> + [HttpPost("WwtlScanBarcode")] + public ResponseResult WwtlScanBarcode([FromBody] WarehouseQuery query) + { + try + { + dynamic resultInfos = new ExpandoObject(); + resultInfos.tbBillList = m.SctlScanBarcode(query); + return new ResponseResult + { + status = 0, + message = "OK", + data = resultInfos + }; + } + catch (Exception ex) + { + return ResponseResult.ResponseError(ex); + } + } } \ No newline at end of file -- Gitblit v1.9.3