From e8eed61d8b70215766a4e5c226e10d2f0d28ff95 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:31:40 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if 4.节拍工价根据工序线编码查找关联设备集合 5.PC/APP工资报表
---
VueWebApi/DLL/DAL/AppPersonalDAL.cs | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppPersonalDAL.cs b/VueWebApi/DLL/DAL/AppPersonalDAL.cs
index 4a49934..1f1b6e1 100644
--- a/VueWebApi/DLL/DAL/AppPersonalDAL.cs
+++ b/VueWebApi/DLL/DAL/AppPersonalDAL.cs
@@ -19,63 +19,67 @@
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
#region[App涓汉璁′欢宸ヨ祫]
- public static ToMessage PieceRateWage(string usercode,string startopendate, string endclosedate)
+ public static ToMessage PieceRateWage(string compute, string usercode,string startopendate, string endclosedate)
{
Dictionary<object, object> dList = new Dictionary<object, object>();
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (compute == "last") //鏈亾宸ュ簭
+ {
+ search += "and P.isend=@isend ";
+ dynamicParams.Add("@isend", "Y");
+ }
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
// --------------鏌ヨ鎶ュ伐鏁般�佽壇鍝佹墸闄ゃ�佽绠楀伐璧勬敹鍏�--------------
var sql = @"select isnull(sum(BB.report_qty),0) as report_qty,(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as userngbadmoney,
- isnull(sum(BB.usermoney),0)-(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as usermoney
- from (
- select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
- AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,
- AA.moneys/colum as usermoney,AA.ngmoneys/colum as userngmoney,AA.badmoneys/colum as userbadmoney,AA.report_person,AA.username,AA.report_date,colum
- from (
- select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
- A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,
- B.report_qty*isnull(S.unprice,0) as moneys,B.ng_qty*isnull(S.unprice,0) as ngmoneys,B.bad_qty*isnull(S.unprice,0) as badmoneys,
- B.report_person,U.username,B.report_date,
- (select distinct count(*) from TK_Wrk_RecordSub S where S.m_id=B.m_id) as colum
- 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 and P.isend='Y'
- 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 B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA) as BB ";
+ isnull(sum(BB.usermoney),0)-(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as usermoney
+ from (
+ select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
+ AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,AA.ratio,AA.isend,
+ AA.moneys as usermoney,AA.badmoneys as userbadmoney,AA.ngmoneys as userngmoney,AA.username,AA.report_date
+ from (
+ select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
+ A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
+ (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,(B.ng_qty*isnull(S.unprice,0))*(B.ratio/100) as ngmoneys,(B.bad_qty*isnull(S.unprice,0))*(B.ratio/100) as badmoneys,
+ B.report_person,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 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 B.report_person=@usercode and B.report_date between @startopendate and @endclosedate "+search+") as AA) as BB";
var data0 = DapperHelper.selectdata(sql, dynamicParams);
dList.Add("dt0", data0);
// --------------鏌ヨ鎶ュ伐鏄庣粏(鎸夌収宸ュ崟銆佷骇鍝併�佸伐搴忓垎缁�)--------------
var sql1 = @"select AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,
AA.task_qty,AA.group_code,AA.group_name,AA.unprice,
- isnull(sum(AA.report_qty),0) as report_qty,isnull(sum(AA.ng_qty),0) as ng_qty,isnull(sum(AA.bad_qty),0) as bad_qty,
+ isnull(sum(AA.report_qty),0) as report_qty,isnull(sum(AA.ng_qty),0) as ng_qty,isnull(sum(AA.bad_qty),0) as bad_qty,AA.ratio,
AA.report_person,AA.username,AA.colum
from (
select distinct A.wo_code,M.partcode,M.partname,T.stepcode,T.stepname,
A.task_qty,G.group_code,G.group_name,isnull(S.unprice,0) as unprice,
- B.report_qty,B.ng_qty,B.bad_qty,
+ B.report_qty,B.ng_qty,B.bad_qty,B.ratio,
B.report_person,U.username,B.report_date,
(select distinct count(*) from TK_Wrk_RecordSub S where S.m_id=B.m_id) as colum
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 and P.isend='Y'
+ 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 B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
+ where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate "+search+") as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.ratio,AA.report_person,AA.username,colum";
var data1 = DapperHelper.selectdata(sql1, dynamicParams);
dList.Add("dt1", data1);
mes.code = "200";
--
Gitblit v1.9.3