From ed68594d0bb3d55271c71d9b43ec5931af62be05 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 11 三月 2025 15:24:03 +0800 Subject: [PATCH] 产品器具清单新增字段:器具类型,工装优先级,工位数;生产资源新增字段:工位数量,产线标准人数;工序新增字段:标准工价;工艺路线编辑修改查询视图;焊接排产:协同生产资源写入排产记录;物料新增字段:工位数; --- WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs index f4b8ec3..95d5d5b 100644 --- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs +++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs @@ -31,30 +31,31 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View"); + ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_View"); } else { string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ " order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View"); } - 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