From a4b3efa1f5d800d56f600b33aaf36022e5dc49d7 Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期三, 09 三月 2022 17:30:27 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 6 +++++- WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs index 9992ce8..96b346d 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs @@ -7,6 +7,7 @@ using System.Net; using System.Net.Http; using System.Web.Http; +using ViewAPI; using WebAPI.Models; namespace WebAPI.Controllers.MJGL @@ -28,6 +29,7 @@ { try { + Log.LogInfo("鎴愬姛锛�"); //璁板綍鎻愪氦鏁版嵁 //缂栬緫鏉冮檺 if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user)) { @@ -37,7 +39,7 @@ objJsonResult.data = null; return objJsonResult; } - + Log.LogInfo("鏈夋潈闄�"); ds = Sc_GetMouldProdInHouseBill(sWhere,Organization); //if (ds.Tables[0].Rows.Count != 0 || ds != null) @@ -69,6 +71,7 @@ public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization) { + LogService.Write(sWhere+";"+ Organization); string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { @@ -77,6 +80,7 @@ else { string sql = sql1 + sWhere+ "order by hmainid desc"; + Log.LogInfo(sql); return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList"); } } diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs index a6a6aad..a90c3b5 100644 --- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs +++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Data; using System.Web.Http; +using ViewAPI; using WebAPI.Models; namespace WebAPI.Controllers { @@ -5028,6 +5029,7 @@ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { + Log.LogInfo(sql1); return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdOutHouseBillList"); } else -- Gitblit v1.9.1