From 1549aca4567113f86f3bc62ee6e9f08b2ed19afd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 26 四月 2024 14:19:46 +0800
Subject: [PATCH] 计划平台优化

---
 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 15577f4..a989769 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -1023,14 +1023,21 @@
                 }
 
                 ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
-                if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"])  //鏄惁绠$悊鍛�
+                string sErr = "";
+                oSystemParameter.ShowBill(ref sErr);
+                if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") 
                 {
-                    //涓嶆槸绠$悊鍛�
-                    sWhere += " and 鍒跺崟浜� = '" + user + "'";
+                }
+                else
+                {
+                    if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"])  //鏄惁绠$悊鍛�
+                    {
+                        //涓嶆槸绠$悊鍛�
+                        sWhere += " and 鍒跺崟浜� = '" + user + "'";
+                    }
                 }
 
-
-                string sql = "select * from  h_v_QC_FirstPieceCheckBillMainList where 1=1  " + sWhere + " order by 鏃ユ湡 ";
+                string sql = "select * from  h_v_QC_FirstPieceCheckBillMainList where 1=1  " + sWhere ;
 
                 ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
 

--
Gitblit v1.9.1