From 50f54028acb8191f18552d5b54a958ff9ce9afc8 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 六月 2023 09:10:42 +0800
Subject: [PATCH] 新增销售出库二次校验功能(原单据为扫码生成,审核时对原扫描的条码进行核对)

---
 WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
index ea09773..f3f86b5 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -24,7 +24,7 @@
         public DLL.ClsPay_SingleBalBill BillOld0 = new DLL.ClsPay_SingleBalBill();   //                                                                                         
 
         /// <summary>
-        /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
+        /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃(涓汉)
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
@@ -43,6 +43,7 @@
                     return objJsonResult;
                 }
                 ds = Sc_GetSingleBalBill(sWhere);
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -63,12 +64,12 @@
         {
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by 鏃ユ湡 desc", "h_v_Pay_SingleBalBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by hmainid desc", "h_v_Pay_SingleBalBillList");
             }
             else
             {
                 string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 ";
-                string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                string sql = sql1 + sWhere + " order by hmainid desc";
                 return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
             }
 
@@ -381,6 +382,37 @@
                 return objJsonResult;
             }
         }
+
+        /// <summary>
+        /// 鐢熸垚宸ヨ祫缁撶畻
+        /// </summary>
+        /// <param name="HBeginDate">寮�濮嬫棩鏈�</param>
+        /// <param name="HEndDate">缁撴潫鏃ユ湡</param>
+        /// <param name="HDeptID">閮ㄩ棬ID</param>
+        /// <returns></returns>
+        [Route("Pay_SingleBalBill/GenerateSalary")]
+        [HttpGet]
+        public object GenerateSalary(string HBeginDate, string HEndDate,int HDeptID)
+        {
+            try
+            {
+                string sql = $"exec h_p_Gy_GenerateSalary '{HBeginDate}','{HEndDate}','{HDeptID}' ";
+                oCN.RunProc(sql); 
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鐢熸垚鎴愬姛";
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鎵ц寮傚父锛岃仈绯荤鐞嗗憳锛佹姤閿欙細" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
         //
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1