From 990a4e89535330febe6254e23eb2fa68623c9054 Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期二, 24 十月 2023 16:57:51 +0800
Subject: [PATCH] 采购订单,收料通知单,退料通知单,采购入库单 ：选择 物料后，带出对应的计量单位；并多选物料返回； 采购入库单 和 退料通知单 的 子表网格显示，完善软件
---
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
index 8ccac8b..62e36ad 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
@@ -31,30 +31,31 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1 ", "h_v_IF_DataDictionary_Proc");
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_Proc");
}
else
{
string sql1 = "select * from h_v_IF_DataDictionary_Proc where 1=1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Proc");
}
- 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)
{
--
Gitblit v1.9.1