From 248480fdc506ca158db89617d2440dd5702f7e69 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 14 四月 2022 09:29:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 352007a..b076c66 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -34,42 +34,39 @@
{
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
- string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 ";
-
- if (sWhere=="" || sWhere == null)
- {
- ds = oCN.RunProcReturn(sql+ " order by hmainid desc", "h_v_IF_POOrderBillList");
- }
- else
- {
- ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc", "h_v_IF_POOrderBillList");
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
//{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 ";
+
+ //if (sWhere=="" || sWhere == null)
+ //{
+ // ds = oCN.RunProcReturn(sql+ " order by hmainid desc", "h_v_IF_POOrderBillList");
+ //}
+ //else
+ //{
+ // ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc", "h_v_IF_POOrderBillList");
+ //}
+
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
+ {
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ }
+ string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+
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