From a905b3df0d0c9ae045b51d1299fbb2f2dcbc2e2d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 21 二月 2022 10:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 405b7ac..091dd16 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -32,20 +32,44 @@
         {
             try
             {
-                //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
-                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");
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
 
+                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)
+                //{
                 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)
             {
@@ -336,7 +360,7 @@
  where b.HInterID in ({2})
  and b. HSOURCEINTERID = {3}
  and a.HERPInterID = 0
-", FID, FBillNo, HInterID, dr["FID"].ToString());
+", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
                             oCn.RunProc(updateSql);
                         }
                         else

--
Gitblit v1.9.1