From 98fdb31018bde24c16598b98cdd1cf526dc1113f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 31 十二月 2024 10:37:01 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/工资管理/Pay_ErrWorkTimesRequestBillController.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
index 9f106ff..a219136 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
@@ -9,7 +9,7 @@
using System.Web.Http;
using WebAPI.Models;
using System.Windows.Forms;
-
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
public class Pay_ErrWorkTimesRequestBillController : ApiController
@@ -77,6 +77,61 @@
objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 寮傚父宸ユ椂鐢宠鍗曞垪琛ㄥ垎椤靛垪琛�
+ [Route("Pay_ErrWorkTimesRequestBillController/page")]
+ [HttpGet]
+ public json Pay_ErrWorkTimesRequestBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Pay_ErrWorkTimesRequestBillList " + page + "," + size + ",''", "h_p_Pay_ErrWorkTimesRequestBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Pay_ErrWorkTimesRequestBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Pay_ErrWorkTimesRequestBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
}
}
#endregion
@@ -801,7 +856,7 @@
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate) " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate,HIsImport) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -826,6 +881,7 @@
"','" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
+ "','" + 0 + //鍒ゆ柇鏄惁鏄鍏�
"')";
//涓昏〃
--
Gitblit v1.9.1