From cc59811b55a7325137822169bce6a9ddfb579e3a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 11 十月 2022 10:31:43 +0800
Subject: [PATCH] 增加工资报表

---
 WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
index 481154e..98e3b7f 100644
--- a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
@@ -30,6 +30,7 @@
             public DateTime HEndDate { get; set; }//缁撴潫鏃堕棿
             public string ProcMul { get; set; }//宸ユ
             public string Hmaker { get; set; }//褰撳墠鐧诲綍浜�
+            public string Arbitrarily { get; set; }//浠绘剰鍙傛暟
         }
 
         [Route("Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList")]
@@ -58,8 +59,10 @@
                 //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
                 CallGoodsBackRequest com = JsonConvert.DeserializeObject<CallGoodsBackRequest>(sWhere.ToString());
 
-                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
-                    $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");
+                oCN.RunProc($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
+                        $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'");
+
+                ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsRequestBillList_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_BackGoodsRequestBillList_Query");
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -236,7 +239,7 @@
                 for (int i = 0; i < listCa.Count; i++)
                 {
                     ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_WHReceive {listCa[i].hmainid},{listCa[i].Hsubid}," +
-                 $"{listCa[i].HSPID},{user}", "h_p_JIT_BackGoods_WHReceive");
+                 $"{listCa[i].HSPID},'{user}'", "h_p_JIT_BackGoods_WHReceive");
 
                     if (ds.Tables[0].Rows[0][0].ToString() == "1")
                     {

--
Gitblit v1.9.1