From 4183f166994ff740662e1726ccbac5480b675d74 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期三, 28 六月 2023 15:08:52 +0800 Subject: [PATCH] 单据(生产订单、工艺路线、工序流转卡、工序进站单(关闭、反关闭无权限)、工序出站单(关闭、反关闭无权限)、工序委外发出单、工序委外接收单、不良品处理单、工序派工单、工序返工记录单、工序返工申请单、其它入库单、其它出库单、生产入库单、生产汇报单):添加审核、反审核、关闭、反关闭按钮 --- WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs index 45e70b1..e478ea5 100644 --- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs +++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs @@ -31,30 +31,31 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1 ", "h_v_IF_DataDictionary_Table"); + ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_Table"); } else { string sql1 = "select * from h_v_IF_DataDictionary_Table where 1=1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ " order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Table"); } - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "false锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + + //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) { @@ -118,7 +119,7 @@ try { //鍒犻櫎鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; -- Gitblit v1.9.1