From ace57897fc40d465114820fcf1c3c87f9bf42f42 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 16 七月 2024 09:24:22 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/条码管理/WEBSController.cs | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" index 8e74584..9f88516 100644 --- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" +++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" @@ -7476,20 +7476,20 @@ DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp"); if (ds1 != null && ds1.Tables[0].Rows.Count == 0) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "淇敼澶辫触锛佸師鍥狅細淇敼鍚庣殑鍗曟嵁鍙峰湪鏈彁浜ょ殑缂撳瓨鍒楄〃涓笉瀛樺湪锛�"; + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛"; objJsonResult.data = null; return objJsonResult; } - - - - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "鎴愬姛"; - objJsonResult.data = ds1.Tables[0]; - return objJsonResult; + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛"; + objJsonResult.data = ds1.Tables[0]; + return objJsonResult; + } } catch (Exception e) { -- Gitblit v1.9.1