From 8f28ca63dde584e5fefe51a07e69fd9b1af76fd2 Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 09 六月 2025 12:28:27 +0800 Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段 --- Controllers/Wom/WwGdController.cs | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Controllers/Wom/WwGdController.cs b/Controllers/Wom/WwGdController.cs index e643409..8ec8e60 100644 --- a/Controllers/Wom/WwGdController.cs +++ b/Controllers/Wom/WwGdController.cs @@ -20,7 +20,7 @@ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns> /// // Demo Request: // POST /api/WwGd/ScanCode - // Body: + // BodyGetItemsByDaa001 // { // "query": { // "Code": "SampleCode", @@ -35,6 +35,15 @@ // 璋冪敤WwGdManager鐨凷canCode鏂规硶杩涜鎵爜鎿嶄綔 dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.ScanCode(query); + if (resultInfos.tbBillList.result == "2") + { + return new ResponseResult + { + status = Convert.ToInt32(resultInfos.tbBillList.result), + message = resultInfos.tbBillList.strMsg, + data = resultInfos + }; + } return new ResponseResult { status = 0, @@ -140,9 +149,19 @@ { try { - // 璋冪敤WwGdManager鐨刉wblScanBarcode鏂规硶鑾峰彇鐗╂枡淇℃伅 dynamic resultInfos = new ExpandoObject(); - resultInfos.materialInfo = m.WwblScanBarcode(query); + var (success, pendingList) = m.WwblScanBarcode(query); + resultInfos.success = success; + resultInfos.pendingList = pendingList; + if (success.status == 2) + { + return new ResponseResult + { + status = Convert.ToInt32(success.status), + message = success.message, + data = resultInfos.success + }; + } return new ResponseResult { status = 0, -- Gitblit v1.9.3