From 6999a662958e1601d78a2db7d698bbd9c9a44f4d Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 28 十一月 2022 13:50:25 +0800
Subject: [PATCH] 计件工资报表修改为取修改报工审核记录
---
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 82 ++++++++++++++++++++++++-----------------
.vs/VueWebApi/v16/.suo | 0
4 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 551bf6e..00feb9e 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index 2a1633e..c1f5552 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -436,22 +436,22 @@
}
if (partcode != "" && partcode != null)
{
- search += "and M.partcode like '%'+@partcode+'%' ";
+ search += "and A.partnumber like '%'+@partcode+'%' ";
dynamicParams.Add("@partcode", partcode);
}
if (partname != "" && partname != null)
{
- search += "and M.partname like '%'+@partname+'%' ";
+ search += "and B.partname like '%'+@partname+'%' ";
dynamicParams.Add("@partname", partname);
}
if (partspec != "" && partspec != null)
{
- search += "and M.partspec like '%'+@partspec+'%' ";
+ search += "and B.partspec like '%'+@partspec+'%' ";
dynamicParams.Add("@partspec", partspec);
}
if (stepname != "" && stepname != null)
{
- search += "and T.stepname like '%'+@stepname+'%' ";
+ search += "and S.stepname like '%'+@stepname+'%' ";
dynamicParams.Add("@stepname", stepname);
}
if (reportname != "" && reportname != null)
@@ -461,7 +461,7 @@
}
if (reportopendate != "" && reportopendate != null)
{
- search += "and B.report_date between @reportopendate and @reportclosedate ";
+ search += "and A.report_date between @reportopendate and @reportclosedate ";
dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
}
@@ -473,17 +473,24 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
- A.task_qty,B.report_qty,isnull(S.unprice,0) as unprice,
- B.report_qty*isnull(S.unprice,0) as moneys,U.username,B.report_date
- from TK_Wrk_Record A
- inner join TK_Wrk_RecordSub B on A.id=B.m_id
- inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
- left join TK_Wrk_Man K on A.wo_code=K.wo_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
- left join TMateriel_Info M on A.materiel_code=M.partcode
- left join TStep T on A.step_code=T.stepcode
- left join TUser U on B.report_person=U.usercode where" + search;
+ //var sql = @"select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
+ // A.task_qty,B.report_qty,isnull(S.unprice,0) as unprice,
+ // B.report_qty*isnull(S.unprice,0) as moneys,U.username,B.report_date
+ // from TK_Wrk_Record A
+ // inner join TK_Wrk_RecordSub B on A.id=B.m_id
+ // inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
+ // left join TK_Wrk_Man K on A.wo_code=K.wo_code
+ // left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ // left join TMateriel_Info M on A.materiel_code=M.partcode
+ // left join TStep T on A.step_code=T.stepcode
+ // left join TUser U on B.report_person=U.usercode where" + search;
+ var sql = @"select A.wo_code,A.partnumber as partcode,B.partname,B.partspec,S.stepcode,S.stepname,
+ A.task_qty,A.report_qty,isnull(A.unprice,0) as unprice,
+ A.report_qty*isnull(A.unprice,0)-isnull(A.bad_money,0) as moneys,U.username,A.report_date
+ from TK_WorkRecord_Verify A
+ left join TMateriel_Info B on A.partnumber=B.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TUser U on A.usercode=U.usercode where "+search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -515,22 +522,22 @@
}
if (partcode != "" && partcode != null)
{
- search += "and M.partcode like '%'+@partcode+'%' ";
+ search += "and A.partnumber like '%'+@partcode+'%' ";
dynamicParams.Add("@partcode", partcode);
}
if (partname != "" && partname != null)
{
- search += "and M.partname like '%'+@partname+'%' ";
+ search += "and B.partname like '%'+@partname+'%' ";
dynamicParams.Add("@partname", partname);
}
if (partspec != "" && partspec != null)
{
- search += "and M.partspec like '%'+@partspec+'%' ";
+ search += "and B.partspec like '%'+@partspec+'%' ";
dynamicParams.Add("@partspec", partspec);
}
if (stepname != "" && stepname != null)
{
- search += "and T.stepname like '%'+@stepname+'%' ";
+ search += "and S.stepname like '%'+@stepname+'%' ";
dynamicParams.Add("@stepname", stepname);
}
if (reportname != "" && reportname != null)
@@ -540,7 +547,7 @@
}
if (reportopendate != "" && reportopendate != null)
{
- search += "and B.report_date between @reportopendate and @reportclosedate ";
+ search += "and A.report_date between @reportopendate and @reportclosedate ";
dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
}
@@ -552,19 +559,26 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,
- A.task_qty as 浠诲姟鏁伴噺,B.report_qty as 鎶ュ伐鏁伴噺,isnull(S.unprice,0) as 宸ュ簭鍗曚环,
- B.report_qty*isnull(S.unprice,0) as 璁′欢宸ヨ祫,U.username as 鎶ュ伐浜哄憳,B.report_date as 鎶ュ伐鏃堕棿
- from TK_Wrk_Record A
- inner join TK_Wrk_RecordSub B on A.id=B.m_id
- inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
- left join TK_Wrk_Man K on A.wo_code=K.wo_code
- left join TGroup G on B.usergroup_code=G.group_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
- left join TMateriel_Info M on A.materiel_code=M.partcode
- left join TStep T on A.step_code=T.stepcode
- left join TUser U on B.report_person=U.usercode
- where " + search;
+ //var sql = @"select distinct A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,
+ // A.task_qty as 浠诲姟鏁伴噺,B.report_qty as 鎶ュ伐鏁伴噺,isnull(S.unprice,0) as 宸ュ簭鍗曚环,
+ // B.report_qty*isnull(S.unprice,0) as 璁′欢宸ヨ祫,U.username as 鎶ュ伐浜哄憳,B.report_date as 鎶ュ伐鏃堕棿
+ // from TK_Wrk_Record A
+ // inner join TK_Wrk_RecordSub B on A.id=B.m_id
+ // inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
+ // left join TK_Wrk_Man K on A.wo_code=K.wo_code
+ // left join TGroup G on B.usergroup_code=G.group_code
+ // left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ // left join TMateriel_Info M on A.materiel_code=M.partcode
+ // left join TStep T on A.step_code=T.stepcode
+ // left join TUser U on B.report_person=U.usercode
+ // where " + search;
+ var sql = @"select A.wo_code as 宸ュ崟缂栧彿,A.partnumber as 浜у搧缂栫爜,B.partname as 浜у搧鍚嶇О,B.partspec as 浜у搧瑙勬牸,S.stepcode as 宸ュ簭缂栫爜,S.stepname as 宸ュ簭鍚嶇О,
+ A.task_qty as 浠诲姟鏁伴噺,A.report_qty as 鎶ュ伐鏁伴噺,isnull(A.unprice,0) as 宸ュ簭鍗曚环,
+ A.report_qty*isnull(A.unprice,0)-isnull(A.bad_money,0) as 璁′欢宸ヨ祫,U.username as 鎶ュ伐浜哄憳,A.report_date as 鎶ュ伐鏃堕棿
+ from TK_WorkRecord_Verify A
+ left join TMateriel_Info B on A.partnumber=B.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TUser U on A.usercode=U.usercode where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃");
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 7914b98..00008c6 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index f5e894a..f6e035c 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.3