From 690b38aa98631607542835f16af8dc71424ca10e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 25 六月 2024 13:29:42 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index fdc247e..1fc4027 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -1615,7 +1615,13 @@
         #endregion
 
         #region 鐢熶骇璐ㄩ噺鏃ユ眹鎶ュ崟鍒楄〃 鏌ヨ
- 
+        public class ReportWorkDemandPlanBill
+        {
+            public string HNumber;
+            public string HName;
+            public DateTime HBeginDate;
+            public DateTime HEndDate;
+        }
         [Route("Sc_QualityReportBill/getSc_QualityReportBillDay")]
         [HttpGet]
         public object getSc_QualityReportBillDay(string sWhere, string user)
@@ -1632,17 +1638,8 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBillMainList order by 鍗曟嵁鍙� desc", "h_v_Sc_StationOutBillMainList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_Sc_StationOutBillMainList where 1 = 1 ";
-                    string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
-                    ds = oCN.RunProcReturn(sql, "h_v_Sc_StationOutBillMainList");
-                }
+                ReportWorkDemandPlanBill Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill>(sWhere);
+                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain  '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}'", "h_p_Sc_StationOutBillMain");
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)

--
Gitblit v1.9.1