From 8ca32345fb7f2a74d3818e36d4996e83a15838f2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 24 三月 2023 09:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index c8a9881..58c5126 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -572,33 +572,15 @@
return objJsonResult;
}
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
- }
+ string sql1 = "select top 2000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
--
Gitblit v1.9.1