From 27f533aa7eb5feeb8908a5bedca4ee29da31abd2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 14 九月 2024 16:02:39 +0800
Subject: [PATCH] 计时工资功能
---
VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs | 24
VueWebCoreApi/Models/AttendanceSetting/AttendanceSave.cs | 27
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 25
VueWebCoreApi/Models/AttendanceSetting/DailyWageReport.cs | 55 +
VueWebCoreApi/DLL/DAL/HourlyWageDAL.cs | 833 +++++++++++++++++++++++++++++
VueWebCoreApi/ApiGroup/OpenApiGroup.cs | 2
VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs | 7
VueWebCoreApi/Models/AttendanceSetting/AttendanceRecord.cs | 31 +
VueWebCoreApi/Models/AttendanceSetting/AttendanceSett.cs | 39 +
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 70 +
VueWebCoreApi/Tools/DapperHelper.cs | 34 +
VueWebCoreApi/DLL/BLL/HourlyWageBLL.cs | 116 ++++
VueWebCoreApi/Models/AttendanceSetting/Attendance.cs | 13
VueWebCoreApi/Controllers/GeneralBasicDataController.cs | 15
VueWebCoreApi/Controllers/HourlyWageController.cs | 352 ++++++++++++
VueWebCoreApi/Startup.cs | 2
VueWebCoreApi/appsettings.json | 2
VueWebCoreApi/Controllers/WorkOrderController.cs | 2
VueWebCoreApi/Controllers/ReportManagerController.cs | 30
19 files changed, 1,627 insertions(+), 52 deletions(-)
diff --git a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
index 044a0cc..6689810 100644
--- a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
+++ b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
@@ -40,6 +40,8 @@
鍗曟嵁鎵撳嵃 = 15,
[Description("鐪嬫澘绠＄悊")]
鐪嬫澘绠＄悊 = 16,
+ [Description("璁℃椂宸ヨ祫")]
+ 璁℃椂宸ヨ祫 = 17,
[Description("App涓汉涓績")]
App涓汉涓績 = 20,
[Description("App鏅鸿兘鍒嗘瀽")]
diff --git a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
index 0c183c1..8400389 100644
--- a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
+++ b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
@@ -116,6 +116,21 @@
}
#endregion
+ #region[鎵�灞炵粍缁囨煡鎵句汉鍛樺熀纭�璧勬枡]
+ /// <summary>
+ /// 鎵�灞炵粍缁囨煡鎵句汉鍛樺熀纭�璧勬枡
+ /// </summary>
+ /// <param name="torgcode">缁勭粐(杞﹂棿)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "TorgPersonPermissions")]
+ [HttpGet]
+ public JsonResult TorgPersonPermissions(string torgcode)
+ {
+ mes = GeneralBasicDataBLL.TorgPersonPermissions(torgcode);
+ return Json(mes);
+ }
+ #endregion
+
#region[鎸夐挳鍩虹璧勬枡]
/// <summary>
/// 鎸夐挳鍩虹璧勬枡
diff --git a/VueWebCoreApi/Controllers/HourlyWageController.cs b/VueWebCoreApi/Controllers/HourlyWageController.cs
new file mode 100644
index 0000000..de66cd7
--- /dev/null
+++ b/VueWebCoreApi/Controllers/HourlyWageController.cs
@@ -0,0 +1,352 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.BLL;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.AttendanceSetting;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.Controllers
+{
+ [ApiExplorerSettings(GroupName = "璁℃椂宸ヨ祫")]
+ [ApiController]
+ [Route("api/[controller]")]
+
+ public class HourlyWageController : Controller
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisCommon redis = new RedisCommon();
+
+ #region[鑰冨嫟璁剧疆鏌ヨ]
+ /// <summary>
+ /// 鑰冨嫟璁剧疆鏌ヨ
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <param name="creatdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceSettSearch")]
+ [HttpGet]
+ [ChannelActionFilter]
+ public JsonResult AttendanceSettSearch(string wkshop_code = null,string creatuser = null, string creatdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鍒涘缓寮�濮嬫椂闂�
+ string paydateenddate = ""; //鍒涘缓缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = HourlyWageBLL.AttendanceSettSearch(wkshop_code, creatuser, paydatestartdate, paydateenddate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鏂板/缂栬緫]
+ /// <summary>
+ /// 鑰冨嫟璁剧疆鏂板/缂栬緫
+ /// </summary>
+ /// <param name="OperType">鎿嶄綔绫诲瀷(Add/Update)</param>
+ /// <param name="attendancesett">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceSettAddUpdate")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult AttendanceSettAddUpdate(AttendanceSett attendancesett, string OperType)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.AttendanceSettAddUpdate(attendancesett, OperType, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鍒犻櫎]
+ /// <summary>
+ /// 鑰冨嫟璁剧疆鍒犻櫎
+ /// </summary>
+ /// <param name="attendancesett">鎻愪氦璁剧疆</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceSettDelete")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult AttendanceSettDelete(AttendanceSett attendancesett)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.AttendanceSettDelete(attendancesett, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鏌ヨ]
+ /// <summary>
+ /// 鑰冨嫟鎵撳崱淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceSearch")]
+ [HttpGet]
+ public JsonResult AttendanceSearch(string usercode = null)
+ {
+ mes = HourlyWageBLL.AttendanceSearch(usercode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鎻愪氦]
+ /// <summary>
+ /// 鑰冨嫟鎵撳崱淇℃伅鎻愪氦
+ /// </summary>
+ /// <param name="attendance">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceSave")]
+ [HttpPost]
+ public JsonResult AttendanceSave(Attendance attendance)
+ {
+ mes = HourlyWageBLL.AttendanceSave(attendance);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鑰冨嫟璁板綍鏌ヨ]
+ /// <summary>
+ /// 鑰冨嫟璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatusercode">鎵撳崱浜哄憳缂栫爜</param>
+ /// <param name="creatdate">鎵撳崱鏃ユ湡</param>
+ /// <param name="status">鏍哥畻鐘舵��(宸叉牳绠�/鏈牳绠�)</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceRecordSearch")]
+ [HttpGet]
+ [ChannelActionFilter]
+ public JsonResult AttendanceRecordSearch(string wkshop_code = null, string creatusercode = null, string creatdate = null,string status=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鎵撳崱寮�濮嬫椂闂�
+ string paydateenddate = ""; //鎵撳崱缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = HourlyWageBLL.AttendanceRecordSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate,status, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏂板缂栬緫]
+ /// <summary>
+ /// 鑰冨嫟璁板綍鏂板缂栬緫
+ /// </summary>
+ /// <param name="OperType">鎿嶄綔绫诲瀷</param>
+ /// <param name="attendanceRecord">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceRecordAddUpdate")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult AttendanceRecordAddUpdate(AttendanceRecord attendanceRecord, string OperType)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.AttendanceRecordAddUpdate(attendanceRecord, OperType, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鍒犻櫎]
+ /// <summary>
+ /// 鑰冨嫟璁板綍鍒犻櫎
+ /// </summary>
+ /// <param name="attendanceRecord">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceRecordDelete")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult AttendanceRecordDelete(AttendanceRecord attendanceRecord)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.AttendanceRecordDelete(attendanceRecord, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏍哥畻鎻愪氦]
+ /// <summary>
+ /// 鑰冨嫟璁板綍鏍哥畻鎻愪氦
+ /// </summary>
+ /// <param name="attendanceSave">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AttendanceRecordSave")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult AttendanceRecordSave(AttendanceSave attendanceSave)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.AttendanceRecordSave(attendanceSave,us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄦ煡璇
+ /// <summary>
+ /// 鏃ヨ鏃跺伐璧勬姤琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatusercode">鎵撳崱浜哄憳缂栫爜</param>
+ /// <param name="creatdate">鎵撳崱鏃ユ湡</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DailyWageReportSearch")]
+ [HttpGet]
+ [ChannelActionFilter]
+ public JsonResult DailyWageReportSearch(string wkshop_code = null, string creatusercode = null, string creatdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鍒涘缓寮�濮嬫椂闂�
+ string paydateenddate = ""; //鍒涘缓缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = HourlyWageBLL.DailyWageReportSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勪慨鏀规墸闄ゆ椂闀裤�佹墸闄よ柂璧刔
+ /// <summary>
+ /// 鏃ヨ鏃跺伐璧勪慨鏀规墸闄ゆ椂闀裤�佹墸闄よ柂璧�
+ /// </summary>
+ /// <param name="dailyWageReport">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "DailyWageReportUpdate")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult DailyWageReportUpdate(DailyWageReport dailyWageReport)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = HourlyWageBLL.DailyWageReportUpdate(dailyWageReport, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄥ鍑篯
+ /// <summary>
+ /// 鏃ヨ鏃跺伐璧勬姤琛ㄥ鍑�
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatusercode">鎵撳崱浜哄憳缂栫爜</param>
+ /// <param name="creatdate">鎵撳崱鏃ユ湡</param>
+ /// <returns></returns>
+ [Route(template: "DailyWageReportExcelSearch")]
+ [HttpGet]
+ [ChannelActionFilter]
+ public JsonResult DailyWageReportExcelSearch(string wkshop_code = null, string creatusercode = null, string creatdate = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鍒涘缓寮�濮嬫椂闂�
+ string paydateenddate = ""; //鍒涘缓缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ mes = HourlyWageBLL.DailyWageReportExcelSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄦ煡璇
+ /// <summary>
+ /// 鏈堣鏃跺伐璧勬姤琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatdate">鏌ヨ鏈堜唤</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MonthlyWageReportSearch")]
+ [HttpPost]
+ [ChannelActionFilter]
+ public JsonResult MonthlyWageReportSearch(string wkshop_code = null, string creatdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鍒涘缓寮�濮嬫椂闂�
+ string paydateenddate = ""; //鍒涘缓缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = HourlyWageBLL.MonthlyWageReportSearch(wkshop_code, paydatestartdate, paydateenddate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄥ鍑篯
+ /// <summary>
+ /// 鏈堣鏃跺伐璧勬姤琛ㄥ鍑�
+ /// </summary>
+ /// <param name="wkshop_code">杞﹂棿缂栫爜</param>
+ /// <param name="creatdate">鎵撳崱鏃ユ湡</param>
+ /// <returns></returns>
+ [Route(template: "MonthlyWageReportExcelSearch")]
+ [HttpGet]
+ [ChannelActionFilter]
+ public JsonResult MonthlyWageReportExcelSearch(string wkshop_code = null,string creatdate = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //鍒涘缓寮�濮嬫椂闂�
+ string paydateenddate = ""; //鍒涘缓缁撴潫鏃堕棿
+ if (creatdate != "" && creatdate != null)
+ {
+ paydatestartdate = creatdate.Split('~')[0].ToString();
+ paydateenddate = creatdate.Split('~')[1].ToString();
+ }
+ mes = HourlyWageBLL.MonthlyWageReportExcelSearch(wkshop_code, paydatestartdate, paydateenddate);
+ return Json(mes);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/Controllers/ReportManagerController.cs b/VueWebCoreApi/Controllers/ReportManagerController.cs
index 4b21f63..e766bb4 100644
--- a/VueWebCoreApi/Controllers/ReportManagerController.cs
+++ b/VueWebCoreApi/Controllers/ReportManagerController.cs
@@ -25,6 +25,7 @@
/// </summary>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -37,7 +38,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportSearch")]
[HttpGet]
- public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null, string wocode = null,string wkshopcode=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null,string socode=null, string wocode = null,string wkshopcode=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -48,7 +49,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wkshopcode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wkshopcode, socode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -59,6 +60,7 @@
/// </summary>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -67,7 +69,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportExcelSearch")]
[HttpGet]
- public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wkshopcode = null, string wocode = null,string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wkshopcode = null, string socode = null, string wocode = null,string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -76,7 +78,7 @@
opendate = lm_date.Split('~')[0].ToString();
closedate = lm_date.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wkshopcode,wocode, partcode, partname, partspec, opendate, closedate);
+ mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wkshopcode, socode,wocode, partcode, partname, partspec, opendate, closedate);
return Json(mes);
}
#endregion
@@ -88,6 +90,7 @@
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -103,7 +106,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportSearch")]
[HttpGet]
- public JsonResult GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public JsonResult GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null,string socode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -114,7 +117,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.GroupSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -139,6 +142,7 @@
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -151,7 +155,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportExcelSearch")]
[HttpGet]
- public JsonResult GroupSalaryReportExcelSearch(string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public JsonResult GroupSalaryReportExcelSearch(string compute,string wkshopcode=null, string socode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -160,7 +164,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wkshopcode, socode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
return Json(mes);
}
#endregion
@@ -172,6 +176,7 @@
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -187,7 +192,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportSearch")]
[HttpGet]
- public JsonResult PeopleSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+ public JsonResult PeopleSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null,string socode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -198,7 +203,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -209,6 +214,7 @@
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+ /// <param name="socode">閿�鍞崟鍙�</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -220,7 +226,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportExcelSearch")]
[HttpGet]
- public JsonResult PeopleSalaryReportExcelSearch(string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+ public JsonResult PeopleSalaryReportExcelSearch(string compute,string wkshopcode=null,string socode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -229,7 +235,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute, wkshopcode, wocode, partcode, partname, partspec,stepcode,stepname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec,stepcode,stepname, reportname, reportopendate, reportclosedate);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index add5868..56173f8 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -19,7 +19,7 @@
[ApiExplorerSettings(GroupName = "宸ュ崟绠＄悊")]
[ApiController]
[Route("api/[controller]")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class WorkOrderController : Controller
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
diff --git a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
index f772eed..b404819 100644
--- a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
@@ -59,6 +59,13 @@
}
#endregion
+ #region[鎵�灞炵粍缁囨煡鎵句汉鍛樺熀纭�璧勬枡]
+ public static ToMessage TorgPersonPermissions(string torgcode)
+ {
+ return GeneralBasicDataDAL.TorgPersonPermissions(torgcode);
+ }
+ #endregion
+
#region[鎸夐挳鍩虹璧勬枡]
public static ToMessage ButtonData()
{
diff --git a/VueWebCoreApi/DLL/BLL/HourlyWageBLL.cs b/VueWebCoreApi/DLL/BLL/HourlyWageBLL.cs
new file mode 100644
index 0000000..04cb0f0
--- /dev/null
+++ b/VueWebCoreApi/DLL/BLL/HourlyWageBLL.cs
@@ -0,0 +1,116 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.DAL;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.AttendanceSetting;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.BLL
+{
+ public class HourlyWageBLL
+ {
+ #region[鑰冨嫟璁剧疆鏌ヨ]
+ public static ToMessage AttendanceSettSearch(string wkshop_code, string creatuser, string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ return HourlyWageDAL.AttendanceSettSearch(wkshop_code,creatuser,paydatestartdate,paydateenddate,startNum,endNum,prop,order);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鏂板/缂栬緫]
+ public static ToMessage AttendanceSettAddUpdate(AttendanceSett attendancesett,string OperType, User us)
+ {
+ return HourlyWageDAL.AttendanceSettAddUpdate(attendancesett, OperType, us);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鍒犻櫎]
+ public static ToMessage AttendanceSettDelete(AttendanceSett attendancesett, User us)
+ {
+ return HourlyWageDAL.AttendanceSettDelete(attendancesett, us);
+ }
+ #endregion
+
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鏌ヨ]
+ public static ToMessage AttendanceSearch(string usercode)
+ {
+ return HourlyWageDAL.AttendanceSearch(usercode);
+ }
+ #endregion
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鎻愪氦]
+ public static ToMessage AttendanceSave(Attendance attendance)
+ {
+ return HourlyWageDAL.AttendanceSave(attendance);
+ }
+ #endregion
+
+
+ #region[鑰冨嫟璁板綍鏌ヨ]
+ public static ToMessage AttendanceRecordSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate,string status, int startNum, int endNum, string prop, string order)
+ {
+ return HourlyWageDAL.AttendanceRecordSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate,status, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏂板缂栬緫]
+ public static ToMessage AttendanceRecordAddUpdate(AttendanceRecord attendanceRecord, string operType, User us)
+ {
+ return HourlyWageDAL.AttendanceRecordAddUpdate(attendanceRecord, operType,us);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鍒犻櫎]
+ public static ToMessage AttendanceRecordDelete(AttendanceRecord attendanceRecord, User us)
+ {
+ return HourlyWageDAL.AttendanceRecordDelete(attendanceRecord, us);
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏍哥畻鎻愪氦]
+ public static ToMessage AttendanceRecordSave(AttendanceSave attendanceSave, User us)
+ {
+ return HourlyWageDAL.AttendanceRecordSave(attendanceSave,us);
+ }
+ #endregion
+
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄦ煡璇
+ public static ToMessage DailyWageReportSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ return HourlyWageDAL.DailyWageReportSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勪慨鏀规墸闄ゆ椂闀裤�佹墸闄よ柂璧刔
+ public static ToMessage DailyWageReportUpdate(DailyWageReport dailyWageReport, User us)
+ {
+ return HourlyWageDAL.DailyWageReportUpdate(dailyWageReport,us);
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄥ鍑篯
+ public static ToMessage DailyWageReportExcelSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate)
+ {
+ return HourlyWageDAL.DailyWageReportExcelSearch(wkshop_code, creatusercode, paydatestartdate, paydateenddate);
+ }
+ #endregion
+
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄦ煡璇
+ public static ToMessage MonthlyWageReportSearch(string wkshop_code,string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ return HourlyWageDAL.MonthlyWageReportSearch(wkshop_code, paydatestartdate, paydateenddate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄥ鍑篯
+ public static ToMessage MonthlyWageReportExcelSearch(string wkshop_code, string paydatestartdate, string paydateenddate)
+ {
+ return HourlyWageDAL.MonthlyWageReportExcelSearch(wkshop_code,paydatestartdate, paydateenddate);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
index 4af4262..c48b6ee 100644
--- a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
@@ -10,24 +10,24 @@
public class ReportManagerBLL
{
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string status, string wkshopcode,string wocode,string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string status, string wkshopcode,string socode, string wocode,string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode, status, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode, status, socode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string status, string wkshopcode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string status, string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate)
{
- return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode, status, wocode, partcode, partname, partspec, opendate, closedate);
+ return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode, status, socode, wocode, partcode, partname, partspec, opendate, closedate);
}
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.GroupSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.GroupSalaryReportSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -39,24 +39,24 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
+ public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
{
- return ReportManagerDAL.GroupSalaryReportExcelSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+ return ReportManagerDAL.GroupSalaryReportExcelSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage PeopleSalaryReportExcelSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
{
- return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate);
+ return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, socode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index ae4fc9d..1d16c78 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -201,6 +201,31 @@
}
#endregion
+ #region[鎵�灞炵粍缁囨煡鎵句汉鍛樺熀纭�璧勬枡]
+ public static ToMessage TorgPersonPermissions(string torgcode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select usercode,username from TUser where storg_code=@torgcode";
+ dynamicParams.Add("@torgcode", torgcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
#region[鎸夐挳鍩虹璧勬枡]
public static ToMessage ButtonData()
{
diff --git a/VueWebCoreApi/DLL/DAL/HourlyWageDAL.cs b/VueWebCoreApi/DLL/DAL/HourlyWageDAL.cs
new file mode 100644
index 0000000..da3e04b
--- /dev/null
+++ b/VueWebCoreApi/DLL/DAL/HourlyWageDAL.cs
@@ -0,0 +1,833 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.AttendanceSetting;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.DAL
+{
+ public class HourlyWageDAL
+ {
+ public static DataTable dt; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static bool res; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+ public static string strProcName = ""; //瀹氫箟鍏ㄥ眬sql鍙橀噺
+ public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
+ public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
+
+ #region[鑰冨嫟璁剧疆鏌ヨ]
+ public static ToMessage AttendanceSettSearch(string wkshop_code, string creatuser, string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (creatuser != "" && creatuser != null)
+ {
+ search += " and S.lm_user=@creatuser ";
+ dynamicParams.Add("@creatuser", creatuser);
+ }
+
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and S.lm_date between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select S.wkshop_code,T.torg_name as wkshop_name,S.workhouse,S.uphouse,S.closehouse,S.downhouse,S.workprice,overprice,U.username,S.lm_date
+ from AttendanceSettings S
+ left join TOrganization T on S.wkshop_code=T.torg_code
+ left join TUser U on S.lm_user=U.usercode where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鏂板/缂栬緫]
+ public static ToMessage AttendanceSettAddUpdate(AttendanceSett attendancesett, string OperType, User us)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (OperType == "Add")
+ {
+ //鍐欏叆璁℃椂宸ヨ祫璁剧疆琛�
+ sql = @"insert into AttendanceSettings(wkshop_code,workhouse,closehouse,workprice,overprice,uphouse,downhouse,lm_user,lm_date)
+ values(@wkshop_code,@workhouse,@closehouse,@workprice,@overprice,@uphouse,@downhouse,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshop_code = attendancesett.wkshop_code,
+ workhouse = attendancesett.workhouse,
+ closehouse = attendancesett.closehouse,
+ workprice = attendancesett.workprice,
+ overprice = attendancesett.overprice,
+ uphouse = attendancesett.uphouse,
+ downhouse = attendancesett.downhouse,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚�冨嫟璁剧疆杞﹂棿涓�:" + attendancesett.wkshop_code + ",涓婄彮鏃堕棿涓�:" + attendancesett.workhouse + ",涓嬬彮鏃堕棿涓�:" + attendancesett.closehouse + "鐨勬爣鍑�", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆鏂板缓鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆鏂板缓澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (OperType == "Update")
+ {
+ //淇敼宸ュ崟琛�
+ sql = @"update AttendanceSettings set workhouse=@workhouse,closehouse=@closehouse,workprice=@workprice,overprice=@overprice,uphouse=@uphouse,downhouse=@downhouse,
+ lm_user=@lm_user,lm_date=@lm_date where wkshop_code=@wkshop_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshop_code = attendancesett.wkshop_code,
+ workhouse = attendancesett.workhouse,
+ closehouse = attendancesett.closehouse,
+ workprice = attendancesett.workprice,
+ overprice = attendancesett.overprice,
+ uphouse = attendancesett.uphouse,
+ downhouse = attendancesett.downhouse,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚�冨嫟璁剧疆杞﹂棿涓�:" + attendancesett.wkshop_code + ",涓婄彮鏃堕棿涓�:" + attendancesett.workhouse + ",涓嬬彮鏃堕棿涓�:" + attendancesett.closehouse + "鐨勬爣鍑�", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆淇敼鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆淇敼澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟璁剧疆鍒犻櫎]
+ public static ToMessage AttendanceSettDelete(AttendanceSett attendancesett, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鏍￠獙褰撳墠鑰冨嫟璁剧疆鏄惁琚紩鐢�
+ sql = @"select * from Attendance where wkshop_code=@wkshop_code";
+ dynamicParams.Add("@wkshop_code", attendancesett.wkshop_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "褰撳墠鑰冨嫟璁剧疆宸茬粡鐢熸垚鑰冨嫟璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ //璁℃椂宸ヨ祫璁剧疆琛�
+ sql = @"delete AttendanceSettings where wkshop_code=@wkshop_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshop_code = attendancesett.wkshop_code
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ LogHelper.WriteLogData(aa.ToString());
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚�冨嫟璁剧疆杞﹂棿涓�:" + attendancesett.wkshop_code + ",涓婄彮鏃堕棿涓�:" + attendancesett.workhouse + ",涓嬬彮鏃堕棿涓�:" + attendancesett.closehouse + "鐨勬爣鍑�", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鑰冨嫟璁剧疆鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鏌ヨ]
+ public static ToMessage AttendanceSearch(string usercode)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ if (usercode == "" || usercode == null)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "宸ュ彿涓嶈兘涓虹┖!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ search += " and A.usercode=@usercode ";
+ dynamicParams.Add("@usercode", usercode);
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var sql = @"select A.wkshop_code,T.torg_name as wkshop_name,U.username,A.createdate,S.workprice
+ from Attendance A
+ left join AttendanceSettings S on A.wkshop_code=S.wkshop_code
+ left join TOrganization T on A.wkshop_code=T.torg_code
+ left join TUser U on A.usercode=U.usercode
+ where convert(date, A.createdate) = convert(date, getdate()) " + search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ //鑾峰彇鐢ㄦ埛淇℃伅
+ var sql0 = @"select U.usercode,U.username,U.storg_code,T.torg_name,
+ STUFF((SELECT ',' + P.postname
+ FROM TPost P
+ WHERE CHARINDEX(',' + P.postcode + ',', ',' + U.post_code + ',') > 0
+ FOR XML PATH('')), 1, 1, '') AS postname
+ from TUser U
+ left join TOrganization T on U.storg_code=T.torg_code
+ where U.usercode=@usercode";
+ dynamicParams.Add("@usercode", usercode);
+ var data0 = DapperHelper.selectdata(sql0, dynamicParams);
+ dir.Add("userdate", data0);
+ dir.Add("checkcrd", data);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = dir.Count;
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟鎵撳崱淇℃伅鎻愪氦]
+ public static ToMessage AttendanceSave(Attendance attendance)
+ {
+ string sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ //鍐欏叆璁℃椂宸ヨ祫鑰冨嫟鎵撳崱琛�
+ sql = @"insert into Attendance(wkshop_code,usercode,createdate) values(@wkshop_code,@usercode,@createdate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshop_code = attendance.wkshop_code,
+ usercode = attendance.user_code,
+ createdate = DateTime.Now.ToString()
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(attendance.user_code, "鎵撳崱", "鐢ㄦ埛:" + attendance.user_code + "鎵撳崱,鎵撳崱鏃堕棿涓�:" + DateTime.Now.ToString() + "", "PC");
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鎵撳崱鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鎵撳崱澶辫触!";
+ mes.data = null;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鑰冨嫟璁板綍鏌ヨ]
+ public static ToMessage AttendanceRecordSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate,string status, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (creatusercode != "" && creatusercode != null)
+ {
+ search += " and A.usercode=@creatusercode";
+ dynamicParams.Add("@creatusercode", creatusercode);
+ }
+
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and A.createdate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ if (status != "" && status != null)
+ {
+ search += " and A.status=@status ";
+ dynamicParams.Add("@status", status);
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,S.wkshop_code,T.torg_name as wkshop_name,A.usercode,U.username,A.createdate,S.workprice,A.status
+ from Attendance A
+ left join AttendanceSettings S on A.wkshop_code=S.wkshop_code
+ left join TOrganization T on A.wkshop_code=T.torg_code
+ left join TUser U on A.usercode=U.usercode where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏂板缂栬緫]
+ public static ToMessage AttendanceRecordAddUpdate(AttendanceRecord attendanceRecord, string operType, User us)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (operType == "Add")
+ {
+ //鍐欏叆璁℃椂宸ヨ祫鑰冨嫟鎵撳崱琛�
+ sql = @"insert into Attendance(wkshop_code,usercode,createdate,status)
+ values(@wkshop_code,@usercode,@createdate,@status)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshop_code = attendanceRecord.wkshop_code,
+ usercode = attendanceRecord.creatusercode,
+ createdate = attendanceRecord.creatdate,
+ status = attendanceRecord.status
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗘墦鍗¤褰曡溅闂翠负:" + attendanceRecord.wkshop_code + ",浜哄憳涓�:" + attendanceRecord.creatusercode + ",鑰冨嫟鏃堕棿涓�:" + attendanceRecord.creatdate + "", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鏂板鎵撳崱璁板綍鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鏂板鎵撳崱璁板綍澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (operType == "Update")
+ {
+ //淇敼璁℃椂宸ヨ祫鑰冨嫟鎵撳崱琛�
+ sql = @"update Attendance set createdate=@createdate where wkshop_code=@wkshop_code and usercode=@usercode and id=@id";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ id= attendanceRecord.id,
+ wkshop_code = attendanceRecord.wkshop_code,
+ usercode = attendanceRecord.creatusercode,
+ createdate = attendanceRecord.creatdate
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗘墦鍗¤褰昳d涓�"+attendanceRecord.id+",杞﹂棿涓�:" + attendanceRecord.wkshop_code + ",浜哄憳涓�:" + attendanceRecord.creatusercode + ",鑰冨嫟鏃堕棿涓�:" + attendanceRecord.creatdate + "", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "淇敼鎵撳崱璁板綍鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "淇敼鎵撳崱璁板綍澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鍒犻櫎]
+ public static ToMessage AttendanceRecordDelete(AttendanceRecord attendanceRecord, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //璁℃椂宸ヨ祫鑰冨嫟鎵撳崱琛�
+ sql = @"delete Attendance where id=@id";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ id = attendanceRecord.id
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ LogHelper.WriteLogData(aa.ToString());
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗘墦鍗¤褰曡溅闂翠负:" + attendanceRecord.wkshop_code + ",浜哄憳涓�:" + attendanceRecord.creatusercode + ",鑰冨嫟鏃堕棿涓�:" + attendanceRecord.creatdate + "", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鎵撳崱璁板綍鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鎵撳崱璁板綍鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鑰冨嫟璁板綍鏍哥畻鎻愪氦]
+ public static ToMessage AttendanceRecordSave(AttendanceSave attendanceSave, User us)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ string paydatestartdate = ""; //寮�濮嬫椂闂�
+ string paydateenddate = ""; //缁撴潫鏃堕棿
+ try
+ {
+ if (attendanceSave.creatdate != "" && attendanceSave.creatdate != null)
+ {
+ paydatestartdate = attendanceSave.creatdate.Split('~')[0].ToString();
+ paydateenddate = attendanceSave.creatdate.Split('~')[1].ToString();
+ }
+ //瀛樺偍杩囩▼鍚�
+ DataTable dt = new DataTable();
+ sql = @"h_p_MES_HourlyWage";
+ dynamicParams.Add("@wkshop_code", attendanceSave.wkshop_code);
+ dynamicParams.Add("@usercode", attendanceSave.creatusercode);
+ dynamicParams.Add("@startdate", paydatestartdate);
+ dynamicParams.Add("@closedate", paydateenddate);
+ dynamicParams.Add("@status", attendanceSave.status);
+ bool a = DapperHelper.IsProcedure(sql, dynamicParams);
+ if (a)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "璁℃椂宸ヨ祫鏍哥畻", "鐢ㄦ埛:" + us.usercode + "杩涜鏍哥畻,鎿嶄綔鏃堕棿涓猴細" + DateTime.Now.ToString() + "", "PC");
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鏍哥畻鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鏍哥畻澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄦ煡璇
+ public static ToMessage DailyWageReportSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (creatusercode != "" && creatusercode != null)
+ {
+ search += " and S.usercode=@creatusercode";
+ dynamicParams.Add("@creatusercode", creatusercode);
+ }
+
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and S.checkindate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select S.id,S.wkshop_code,T.torg_name as wkshop_name,S.usercode,U.username,S.checkindate,S.workcount,S.workprice,
+ S.overcount,S.overprice,S.deductcount,S.deductmoney,S.timimoney
+ from AttendanceSum S
+ left join TOrganization T on S.wkshop_code=T.torg_code
+ left join TUser U on S.usercode=U.usercode where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勪慨鏀规墸闄ゆ椂闀裤�佹墸闄よ柂璧刔
+ public static ToMessage DailyWageReportUpdate(DailyWageReport dailyWageReport, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //璁℃椂宸ヨ祫鏃ユ眹鎬昏〃
+ sql = @"update AttendanceSum set deductcount=@deductcount,deductmoney=@deductmoney where id=@id";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ id = dailyWageReport.id,
+ deductcount = dailyWageReport.deductcount,
+ deductmoney = dailyWageReport.deductmoney
+ }
+ });
+ bool aa = DapperHelper.DoTransaction(list);
+ LogHelper.WriteLogData(aa.ToString());
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗伐璧勬棩姹囨�昏〃,杞﹂棿涓�:"+dailyWageReport.whshop_code+",鎵撳崱浜�:"+dailyWageReport.usercode+",鎵撳崱鏃堕棿涓�:"+dailyWageReport.checkindate+",鎵ｉ櫎鏃堕暱涓�:" + dailyWageReport.deductcount + ",鎵ｉ櫎宸ヨ祫涓�:" + dailyWageReport.deductmoney + "鐨勫伐璧勮褰�", us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "宸ヨ祫淇敼鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "宸ヨ祫淇敼澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鏃ヨ鏃跺伐璧勬姤琛ㄥ鍑篯
+ public static ToMessage DailyWageReportExcelSearch(string wkshop_code, string creatusercode, string paydatestartdate, string paydateenddate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (creatusercode != "" && creatusercode != null)
+ {
+ search += " and S.usercode=@creatusercode";
+ dynamicParams.Add("@creatusercode", creatusercode);
+ }
+
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and S.checkindate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select S.wkshop_code as 鎵�灞炶溅闂寸紪鐮�,T.torg_name as 鎵�灞炶溅闂�,S.usercode as 鎵撳崱浜哄憳缂栫爜,U.username as 鎵撳崱浜哄憳,S.checkindate as 鎵撳崱鏃ユ湡,
+ S.workcount as '涓婄彮鏃堕暱(灏忔椂)',S.workprice as '宸ヤ环(鍏�/灏忔椂)',S.overcount as '鍔犵彮鏃堕暱(灏忔椂)',S.overprice as '鍔犵彮宸ヤ环(鍏�/灏忔椂)',
+ S.deductcount as '鎵ｉ櫎鏃堕暱(灏忔椂)',S.deductmoney as '鎵ｉ櫎宸ヨ祫(鍏�)',S.timimoney as '璁℃椂宸ヨ祫(鍏�)',(S.timimoney-S.deductmoney) as '缁撶畻宸ヨ祫(鍏�)'
+ from AttendanceSum S
+ left join TOrganization T on S.wkshop_code=T.torg_code
+ left join TUser U on S.usercode=U.usercode where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "鏃ヨ鏃跺伐璧勬姤琛�");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄦ煡璇
+ public static ToMessage MonthlyWageReportSearch(string wkshop_code, string paydatestartdate, string paydateenddate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and S.checkindate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select T.torg_name as wkshop_name,U.username,
+ sum(S.workcount) as TotalWorkCount,
+ avg(S.workprice) as workprice,
+ sum(S.overcount) AS TotalOverCount,
+ avg(S.overprice) as overprice,
+ (sum(S.workcount) * avg(S.workprice)) AS TotalWorkValue,
+ (sum(S.overcount) * avg(S.overprice)) AS TotalOverValue,
+ sum(S.timimoney) AS TotalTimedMoney
+ from AttendanceSum S
+ left join TOrganization T on S.wkshop_code=T.torg_code
+ left join TUser U on S.usercode=U.usercode
+ where 1=1 " + search+ " group by T.torg_name,U.username";
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鏈堣鏃跺伐璧勬姤琛ㄥ鍑篯
+ public static ToMessage MonthlyWageReportExcelSearch(string wkshop_code, string paydatestartdate, string paydateenddate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshop_code != "" && wkshop_code != null)
+ {
+ search += " and S.wkshop_code=@wkshop_code ";
+ dynamicParams.Add("@wkshop_code", wkshop_code);
+ }
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += " and S.checkindate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select T.torg_name as '鎵�灞炶溅闂�',U.username as '鎵撳崱浜哄憳',
+ sum(S.workcount) as '鎬诲伐浣滄椂闀�(灏忔椂)',
+ avg(S.workprice) as '姣忓皬鏃跺崟浠�(鍏�)',
+ sum(S.overcount) as '鎬诲姞鐝椂闀�(灏忔椂)',
+ avg(S.overprice) as '鍔犵彮姣忓皬鏃跺崟浠�(鍏�)',
+ (sum(S.workcount) * avg(S.workprice)) as '鎬诲伐浣滃伐璧�(鍏�)',
+ (sum(S.overcount) * avg(S.overprice)) as '鎬诲姞鐝伐璧�(鍏�)',
+ sum(S.timimoney) AS '鎬昏鏃跺伐璧�(鍏�)'
+ from AttendanceSum S
+ left join TOrganization T on S.wkshop_code=T.torg_code
+ left join TUser U on S.usercode=U.usercode
+ where 1=1 " + search + " group by T.torg_name,U.username";
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "鏈堣鏃跺伐璧勬姤琛�");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index 7a93986..ba515a2 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -20,7 +20,7 @@
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status,string socode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -45,6 +45,11 @@
search += "and AA.status='鏈紑濮�' ";
break;
}
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and AA.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -72,11 +77,6 @@
dynamicParams.Add("@opendate", opendate + " 00:00:00");
dynamicParams.Add("@closedate", closedate + " 23:59:59");
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select top 100 percent AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.status,AA.lm_date,
@@ -99,7 +99,7 @@
left join TMateriel_Info P on W.materiel_code=p.partcode
left join TOrganization F on W.wkshp_code=F.torg_code
group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
- ) as AA where " + search;
+ ) as AA where AA.concat_name is not null " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
@@ -118,7 +118,7 @@
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode,string partcode, string partname, string partspec, string opendate, string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status,string socode, string wocode,string partcode, string partname, string partspec, string opendate, string closedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -143,6 +143,11 @@
search += "and AA.status='鏈紑濮�' ";
break;
}
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and AA.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -170,11 +175,6 @@
dynamicParams.Add("@opendate", opendate + " 00:00:00");
dynamicParams.Add("@closedate", closedate + " 23:59:59");
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -200,7 +200,7 @@
left join TOrganization F on W.wkshp_code=F.torg_code
group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
) as AA
- where " + search;
+ where where AA.concat_name is not null " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "鐢熶骇杩涘害鎶ヨ〃");
@@ -222,7 +222,7 @@
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -237,6 +237,11 @@
{
search += "and K.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and K.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -286,7 +291,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.id,K.wkshp_code,F.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
+ var sql = @"select distinct A.id,K.wkshp_code,F.torg_name as wkshp_name,K.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
isnull(A.step_price,0) as unprice,A.good_qty*isnull(A.step_price,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -348,7 +353,7 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
+ public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -363,6 +368,11 @@
{
search += "and K.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and K.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -411,7 +421,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct K.wkshp_code as 杞﹂棿缂栫爜,F.torg_name as 杞﹂棿鍚嶇О, A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
+ var sql = @"select distinct K.wkshp_code as 杞﹂棿缂栫爜,F.torg_name as 杞﹂棿鍚嶇О,K.saleOrderCode as '閿�鍞崟鍙�',A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,A.task_qty as 浠诲姟鏁伴噺,G.usergroupcode as 鐝粍缂栫爜,G.usergroupname as 鐝粍鍚嶇О,
A.good_qty as 鎶ュ伐鏁伴噺,isnull(A.step_price,0) as 宸ュ簭鍗曚环,A.good_qty*isnull(A.step_price,0) as 璁′欢宸ヨ祫,U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿,B.report_date as 鎶ュ伐鏃堕棿
from TK_Wrk_Record A
@@ -445,7 +455,7 @@
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -460,6 +470,11 @@
{
search += "and AA.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and AA.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -510,7 +525,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,M.saleOrderCode,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
A.task_qty,B.report_qty,isnull(A.step_price,0) as step_price,(B.report_qty*isnull(A.step_price,0)) as moneys,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -527,7 +542,7 @@
left join TOrganization F on M.wkshp_code=F.torg_code
where A.style='B' and B.style='B' and A.verify='Y' and B.usergroup_code=''
union all
- select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,M.saleOrderCode,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
M.plan_qty as task_qty,B.sqty as report_qty,isnull(A.step_price,0) as step_price,(B.sqty*isnull(A.step_price,0)) as moneys,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
@@ -563,7 +578,7 @@
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode,string socode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -578,6 +593,11 @@
{
search += "and AA.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (socode != "" && socode != null)
+ {
+ search += "and AA.saleOrderCode like '%'+@socode+'%' ";
+ dynamicParams.Add("@socode", socode);
}
if (wocode != "" && wocode != null)
{
@@ -627,11 +647,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as '宸ュ崟鍙�',AA.partcode as '浜у搧缂栫爜',AA.partname '浜у搧鍚嶇О',AA.partspec as '瑙勬牸鍨嬪彿',AA.step_seq as '宸ュ簭搴忓彿',
+ var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.saleOrderCode as '閿�鍞崟鍙�',AA.wo_code as '宸ュ崟鍙�',AA.partcode as '浜у搧缂栫爜',AA.partname '浜у搧鍚嶇О',AA.partspec as '瑙勬牸鍨嬪彿',AA.step_seq as '宸ュ簭搴忓彿',
AA.step_code as '宸ュ簭缂栫爜',AA.stepname as '宸ュ簭鍚嶇О',(case when AA.steptype='Z' then '鑷埗' else '澶栧崗' end) as '宸ュ簭绫诲瀷',AA.task_qty as '浠诲姟鏁伴噺',AA.report_qty as '鎶ュ伐鏁伴噺',
AA.step_price as '宸ュ簭鍗曚环',AA.moneys as '璁′欢宸ヨ祫',AA.usercode as '鎶ュ伐浜哄憳缂栧彿',AA.username as '鎶ュ伐浜哄憳鍚嶇О',AA.report_date as '鎶ュ伐鏃堕棿'
from(
- select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,M.saleOrderCode,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
A.task_qty,B.report_qty,isnull(A.step_price,0) as step_price,(B.report_qty*isnull(A.step_price,0)) as moneys,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -648,7 +668,7 @@
left join TOrganization F on M.wkshp_code=F.torg_code
where A.style='B' and B.style='B' and A.verify='Y' and B.usergroup_code=''
union all
- select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,M.saleOrderCode,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
M.plan_qty as task_qty,B.sqty as report_qty,isnull(A.step_price,0) as step_price,(B.sqty*isnull(A.step_price,0)) as moneys,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
diff --git a/VueWebCoreApi/Models/AttendanceSetting/Attendance.cs b/VueWebCoreApi/Models/AttendanceSetting/Attendance.cs
new file mode 100644
index 0000000..46d0457
--- /dev/null
+++ b/VueWebCoreApi/Models/AttendanceSetting/Attendance.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.AttendanceSetting
+{
+ public class Attendance
+ {
+ public string wkshop_code { get; set; }
+ public string user_code { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Models/AttendanceSetting/AttendanceRecord.cs b/VueWebCoreApi/Models/AttendanceSetting/AttendanceRecord.cs
new file mode 100644
index 0000000..6b96cf4
--- /dev/null
+++ b/VueWebCoreApi/Models/AttendanceSetting/AttendanceRecord.cs
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.AttendanceSetting
+{
+ public class AttendanceRecord
+ {
+ /// <summary>
+ /// 鎶ュ伐璁板綍id
+ /// </summary>
+ public string id { get; set; }
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string wkshop_code { get; set; }
+ /// <summary>
+ /// 鎵撳崱浜哄憳缂栫爜
+ /// </summary>
+ public string creatusercode { get; set; }
+ /// <summary>
+ /// 鎵撳崱鏃ユ湡
+ /// </summary>
+ public string creatdate { get; set; }
+ /// <summary>
+ /// 鏍哥畻鐘舵��
+ /// </summary>
+ public string status { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Models/AttendanceSetting/AttendanceSave.cs b/VueWebCoreApi/Models/AttendanceSetting/AttendanceSave.cs
new file mode 100644
index 0000000..8e229d7
--- /dev/null
+++ b/VueWebCoreApi/Models/AttendanceSetting/AttendanceSave.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.AttendanceSetting
+{
+ public class AttendanceSave
+ {
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string wkshop_code { get; set; }
+ /// <summary>
+ /// 鎵撳崱浜哄憳缂栫爜
+ /// </summary>
+ public string creatusercode { get; set; }
+ /// <summary>
+ /// 鎵撳崱鏃ユ湡
+ /// </summary>
+ public string creatdate { get; set; }
+ /// <summary>
+ /// 鏍哥畻鐘舵��
+ /// </summary>
+ public string status { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Models/AttendanceSetting/AttendanceSett.cs b/VueWebCoreApi/Models/AttendanceSetting/AttendanceSett.cs
new file mode 100644
index 0000000..c656585
--- /dev/null
+++ b/VueWebCoreApi/Models/AttendanceSetting/AttendanceSett.cs
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.AttendanceSetting
+{
+ public class AttendanceSett
+ {
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string wkshop_code { get; set; }
+ /// <summary>
+ /// 涓婄彮鏃堕棿
+ /// </summary>
+ public string workhouse { get; set; }
+ /// <summary>
+ /// 涓嬬彮鏃堕棿
+ /// </summary>
+ public string closehouse { get; set; }
+ /// <summary>
+ /// 姝ｅ父涓婄彮宸ヤ环
+ /// </summary>
+ public string workprice { get; set; }
+ /// <summary>
+ /// 鍔犵彮宸ヤ环
+ /// </summary>
+ public string overprice { get; set; }
+ /// <summary>
+ /// 涓婄彮鎵撳崱鏈夋晥鑼冨洿/灏忔椂
+ /// </summary>
+ public string uphouse { get; set; }
+ /// <summary>
+ /// 涓嬬彮鎵撳紑鏈夋晥鑼冨洿/灏忔椂
+ /// </summary>
+ public string downhouse { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Models/AttendanceSetting/DailyWageReport.cs b/VueWebCoreApi/Models/AttendanceSetting/DailyWageReport.cs
new file mode 100644
index 0000000..8032b8d
--- /dev/null
+++ b/VueWebCoreApi/Models/AttendanceSetting/DailyWageReport.cs
@@ -0,0 +1,55 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.AttendanceSetting
+{
+ public class DailyWageReport
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public string id { get; set; }
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string whshop_code { get; set; }
+ /// <summary>
+ /// 鎵撳崱鏃ユ湡
+ /// </summary>
+ public string checkindate { get; set; }
+ /// <summary>
+ /// 鎵撳崱浜哄憳
+ /// </summary>
+ public string usercode { get; set; }
+ /// <summary>
+ /// 宸ヤ綔鏃堕暱(灏忔椂)
+ /// </summary>
+ public string workcount { get; set; }
+ /// <summary>
+ /// 璁℃椂宸ヤ环(鍏�/灏忔椂)
+ /// </summary>
+ public string workprice { get; set; }
+ /// <summary>
+ /// 鍔犵彮鏃堕暱(灏忔椂)
+ /// </summary>
+ public string overcount { get; set; }
+ /// <summary>
+ /// 鍔犵彮宸ヤ环(鍏�/灏忔椂)
+ /// </summary>
+ public string overprice { get; set; }
+ /// <summary>
+ /// 鎵ｉ櫎鏃堕暱(灏忔椂)
+ /// </summary>
+ public string deductcount { get; set; }
+ /// <summary>
+ /// 鎵ｉ櫎钖祫(鍏�)
+ /// </summary>
+ public string deductmoney { get; set; }
+ /// <summary>
+ /// 璁℃椂宸ヨ祫(鍏�)
+ /// </summary>
+ public string timimoney { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index 863b384..ee50aa3 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -73,7 +73,7 @@
{
c.SwaggerDoc(version, new OpenApiInfo()
{
- Title = $"新凯迪产品-MesApi文档:{version}",
+ Title = $"桥下工贸-MesApi文档:{version}",
Version = version,
Description = $"Panda.Sewerage : {version} ",
});
diff --git a/VueWebCoreApi/Tools/DapperHelper.cs b/VueWebCoreApi/Tools/DapperHelper.cs
index ea6d910..694a514 100644
--- a/VueWebCoreApi/Tools/DapperHelper.cs
+++ b/VueWebCoreApi/Tools/DapperHelper.cs
@@ -477,6 +477,40 @@
/// <param name="sql">瀛樺偍杩囩▼鍚�</param>
/// <param name="parm">鍙傛暟</param>
/// <returns></returns>
+ public static bool selectProcedureTable(string sql, Object parm, out DataTable table)
+ {
+ bool result;
+ //sql璇彞
+ using (IDbConnection conn = sqlConnection())
+ {
+ try
+ {
+ var res = conn.ExecuteReader(sql, parm, commandType: CommandType.StoredProcedure);//sql 瀛樺偍杩囩▼
+ table= (DataTable)res;
+ result = true;
+ }
+ catch (Exception ex)
+ {
+ //鍒涘缓鏃ュ織璁板綍缁勪欢瀹炰緥
+ LogHelper.WriteLog(ex);
+ throw ex;
+ }
+ finally
+ {
+ conn.Dispose();
+ conn.Close();
+ }
+ return result;
+ }
+
+ }
+
+ /// <summary>
+ /// Dapper鎵ц瀛樺偍杩囩▼杩斿洖datatable鏁版嵁(甯﹀弬鏁�)
+ /// </summary>
+ /// <param name="sql">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parm">鍙傛暟</param>
+ /// <returns></returns>
public static bool IsProcedure(string sql, Object parm)
{
bool result;
diff --git a/VueWebCoreApi/appsettings.json b/VueWebCoreApi/appsettings.json
index 2a4cf0b..e725d23 100644
--- a/VueWebCoreApi/appsettings.json
+++ b/VueWebCoreApi/appsettings.json
@@ -9,7 +9,7 @@
"AllowedHosts": "*",
//鏈嶅姟鍣ㄧ幆澧�
"ConnectionStrings": {
- "DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=xkdvmes;User ID=sa;Password=xkd@20230101;pooling=false",
+ "DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=vmes_qx;User ID=sa;Password=xkd@20230101;pooling=false",
//浼佷笟缂栫爜
"CompanyCode": "000",
//浼佷笟鍚嶇О
--
Gitblit v1.9.3