From a4806a0c94db5199920272ca6ace1cef8d48c630 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 六月 2022 17:11:27 +0800
Subject: [PATCH] 工艺路线 和 工序流转卡 新增功能与维护

---
 WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index dee19ee..e168699 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -31,18 +31,27 @@
         {
             try
             {
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+                //if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
                 //if (sWhere == null || sWhere.Equals(""))
                 //{
-                //    ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList");
+                //    ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "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");
+                //    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)
                 {
@@ -51,11 +60,22 @@
                 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 = "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