From 261e4f0953cee0070fd790d299372d375087e500 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 七月 2023 13:31:49 +0800
Subject: [PATCH] 生产订单编辑 加 客户规格型号 客户物料名称 客户订单报表增加两字段（业务状态、备注取生产订单），报表增加两个按钮，可以去变更两个字段的值。（业务状态修改成完工之后，报表就显示ok，选择其中一行变更后反写到生产订单当中）
---
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