From 1fec2f9ed5f7a8b1c4a6feddc585dba88ed6b3c9 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 19 十一月 2021 08:22:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/WebAPIController.cs |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 03fbe4b..ff11189 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2144,21 +2144,13 @@
         /// <returns></returns>
         [Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
         [HttpGet]
-        public object GetMouldDotCheckRuleInterList(int MouldProjectID)
+        public object GetMouldDotCheckRuleInterList(string sWhere)
         {
-            if (MouldProjectID <= 0)
-            {
-                objjson.code = "0";
-                objjson.count = 0;
-                objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
-                objjson.data = null;
-                return objjson;
-            }
             try
             {
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList");
-                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList");
+                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
+                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objjson.code = "0";

--
Gitblit v1.9.1