From 314f15fe2caeb0d09f3824aa3ebcc8d8ecb2221e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 03 三月 2025 17:25:52 +0800
Subject: [PATCH] 1.用户信息新增：薪资类型：S(计件)，T(计时)，M(月) 2.人员工资明细报表去掉外协部分 3.生产工单增加批量绑定工艺接口(PartSelectRputeList,RouteSelectStepList,UpdateMesOrderStepListSearch,AddUpdateMesOrderList) 4.生产工单增加自定义字段（B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6） 5.增加仓库看板接口（ProcureOutsourcLeftTop,ProductConsignmentLeftBottom,ProcureOutsourcRightTop,ProductionStockedInRightBottom）
---
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 38 ++------------------------------------
1 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index ba515a2..1f03f6e 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -540,24 +540,7 @@
left join TStep S on A.step_code=S.stepcode
left join TMateriel_Info P on A.materiel_code=P.partcode
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,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
- FROM TUser U
- WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.in_person + ',') > 0
- FOR XML PATH('')), 1, 1, '') AS username,
- B.in_time as report_date
- from TK_Wrk_OutRecord A
- inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
- left join TK_Wrk_Man M on A.wo_code = M.wo_code
- left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
- left join TStep S on A.step_code = S.stepcode
- left join TMateriel_Info P on A.materiel_code = P.partcode
- left join TOrganization F on M.wkshp_code=F.torg_code
- where A.style = 'S' and B.style = 'S' and A.verify='Y'
+ where A.style='B' and B.style='B' and B.payrate='S' and A.verify='Y' and B.usergroup_code=''
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -666,24 +649,7 @@
left join TStep S on A.step_code=S.stepcode
left join TMateriel_Info P on A.materiel_code=P.partcode
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,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
- FROM TUser U
- WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.in_person + ',') > 0
- FOR XML PATH('')), 1, 1, '') AS username,
- B.in_time as report_date
- from TK_Wrk_OutRecord A
- inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
- left join TK_Wrk_Man M on A.wo_code = M.wo_code
- left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
- left join TStep S on A.step_code = S.stepcode
- left join TMateriel_Info P on A.materiel_code = P.partcode
- left join TOrganization F on M.wkshp_code=F.torg_code
- where A.style = 'S' and B.style = 'S' and A.verify='Y'
+ where A.style='B' and B.style='B' and B.payrate='S' and A.verify='Y' and B.usergroup_code=''
) as AA
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
--
Gitblit v1.9.3