From 82f41ba53073e1e8ce0c21489b7d4f34178ebf8d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 08 二月 2022 16:55:58 +0800
Subject: [PATCH] 采购管理 销售管理 仓存管理-验收入库-领料发货 页面页数调整,数据排序
---
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index dee19ee..c2ac84a 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -31,31 +31,51 @@
{
try
{
- //if (sWhere == null || sWhere.Equals(""))
- //{
- // ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList");
- //}
- //else
- //{
- // string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
- //}
-
- //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
- if (!isCgjl)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
{
- sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
}
- string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
+ }
+
+ ////鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
+ //bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
+ //if (!isCgjl)
+ //{
+ // sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ //}
+ //string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
+ //ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
+
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺褰�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
--
Gitblit v1.9.1