From 0e86ae3692dc5e5c1dca33615d76660b589a8fd5 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 10 三月 2022 15:04:59 +0800
Subject: [PATCH] 快速生成条码模块

---
 WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
index 0c10e5a..3c130a4 100644
--- a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
@@ -23,12 +23,29 @@
         /// <returns></returns>
         [Route("Sc_ProductionReturnBill/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string user)
         {
             try
             {
-
-                ds = Sc_GetProductInBill(sWhere);
+                //鍒ゆ柇鏄惁鏈夋煡璇㈢殑鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Kf_ProductionReturnBill_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_IF_ProductionReturnList where 1=1  order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
+                }
+                else
+                {
+                    string sql = "select * from h_v_IF_ProductionReturnList where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc";
+                    ds = oCN.RunProcReturn(sql, "h_v_IF_ProductionReturnList");
+                }
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objJsonResult.code = "0";
@@ -55,14 +72,5 @@
                 return objJsonResult;
             }
         }
-
-        #region sql璇彞
-
-
-        public static DataSet Sc_GetProductInBill(string sWhere)
-        {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductionReturnList order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
-        }
-        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1