From dc708ece0dce875d0d296ba56f8b59ae6f392e27 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 22 三月 2024 09:56:13 +0800
Subject: [PATCH] 1.生产进度报表查询参数删减 2.新工单带出历史最新一次工序信息查询接口修改
---
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index 228ed13..fa89d22 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -80,11 +80,11 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
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,
- AA.route_code,AA.route_name,AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name
+ AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name
from (
- select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name as wkshp_name,
+ select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
case when W.status='START' then '鎵ц涓�' when W.status='CLOSED' then '宸插畬鎴�' else '鏈紑濮�' end as status,
- W.lm_date,W.route_code,R.name as route_name,
+ W.lm_date,
P.partcode,P.partname,P.partspec,W.plan_qty,
(
select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+','
@@ -97,9 +97,8 @@
select wo,saleOrderCode from TKimp_Ewo
) as E on W.m_po=E.wo
left join TMateriel_Info P on W.materiel_code=p.partcode
- left join TFlw_Rout R on W.route_code=R.code
- left join TOrganization F on W.wkshp_code=F.org_code
- group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,W.plan_qty
+ 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;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -183,9 +182,9 @@
AA.status as 宸ュ崟鐘舵��,AA.lm_date as 鍗曟嵁鏃ユ湡,AA.route_code as 宸ヨ壓璺嚎缂栧彿,AA.route_name as 宸ヨ壓璺嚎鍚嶇О,
AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.plan_qty as 浠诲姟鏁伴噺,left(AA.concat_name,len(concat_name)-1) as 鐢熶骇杩涘害
from (
- select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name as wkshp_name,
+ select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
case when W.status='START' then '鎵ц涓�' when W.status='CLOSED' then '宸插畬鎴�' else '鏈紑濮�' end as status,
- W.lm_date,W.route_code,R.name as route_name,
+ W.lm_date,
P.partcode,P.partname,P.partspec,W.plan_qty,
(
select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+','
@@ -198,9 +197,8 @@
select wo,saleOrderCode from TKimp_Ewo
) as E on W.m_po=E.wo
left join TMateriel_Info P on W.materiel_code=p.partcode
- left join TFlw_Rout R on W.route_code=R.code
- left join TOrganization F on W.wkshp_code=F.org_code
- group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,W.plan_qty
+ 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;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
--
Gitblit v1.9.3