From 6660b22e25881f36fa20f27ffd5826f649b1dcb4 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 15 二月 2022 08:32:40 +0800
Subject: [PATCH] 班组计件单

---
 WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index 6093f7a..5b96788 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -31,26 +31,33 @@
         {
             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, true, 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");
 
+                string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn(sql1, "h_v_IF_EntrustOrderBillList");
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn(sql1+ sWhere, "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;
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "Sucess锛�";

--
Gitblit v1.9.1