From e2f060cb7f09eb334ccc6c5e696fa1dbeb732470 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 四月 2024 17:18:44 +0800
Subject: [PATCH] 首件/工序 检验单 列表只查询主表数据,设备点检/保养 记录单 只查询表头数据

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

diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index 5545e83..3160d31 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -15,7 +15,8 @@
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill();   //瀵瑰簲鍗曟嵁绫�
-        public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill();   //瀵瑰簲鍗曟嵁绫�
+        public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill();   //瀵瑰簲鍗曟嵁绫�                                            
+        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();   //鑾峰彇绯荤粺鍙傛暟
 
         #region 璁惧鐐规璁板綍琛�
 
@@ -38,15 +39,34 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (sWhere == null || sWhere.Equals(""))
+
+                string sReturn = "";
+                string HViewName = "h_v_Sb_EquipDotCheckBillList";//瑙嗗浘鍛藉悕
+                if (oSystemParameter.ShowBill(ref sReturn) == true)
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckBillList");
+                    if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵")
+                    {
+                        HViewName = "h_v_Sb_EquipDotCheckBillMainList";
+                    }
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_Sb_EquipDotCheckBillList where 1 = 1";
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from " + HViewName + " " + sWhere + " order by hmainid desc", HViewName);
+                }
+                else
+                {
+                    string sql1 = "select * from " + HViewName + " " + " where 1 = 1";
                     string sql = sql1 + sWhere + " order by hmainid desc";
-                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
+                    ds = oCN.RunProcReturn(sql, HViewName);
                 }
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)

--
Gitblit v1.9.1