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 | 54 +++++++++++-------------------------------------------
1 files changed, 11 insertions(+), 43 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index a938209..fa89d22 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 saleordercode, string routecode, string routename, 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 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 = "";
@@ -50,21 +50,6 @@
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
dynamicParams.Add("@wocode", wocode);
- }
- if (saleordercode != "" && saleordercode != null)
- {
- search += "and AA.saleOrderCode like '%'+@saleordercode+'%' ";
- dynamicParams.Add("@saleordercode", saleordercode);
- }
- if (routecode != "" && routecode != null)
- {
- search += "and AA.route_code like '%'+@routecode+'%' ";
- dynamicParams.Add("@routecode", routecode);
- }
- if (routename != "" && routename != null)
- {
- search += "and AA.route_name like '%'+@routename+'%' ";
- dynamicParams.Add("@routename", routename);
}
if (partcode != "" && partcode != null)
{
@@ -95,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))+','
@@ -112,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";
@@ -134,7 +118,7 @@
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string saleordercode, string routecode, string routename, string partcode, string partname, string partspec, string opendate, string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode,string partcode, string partname, string partspec, string opendate, string closedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -164,21 +148,6 @@
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
dynamicParams.Add("@wocode", wocode);
- }
- if (saleordercode != "" && saleordercode != null)
- {
- search += "and AA.saleOrderCode like '%'+@saleordercode+'%' ";
- dynamicParams.Add("@saleordercode", saleordercode);
- }
- if (routecode != "" && routecode != null)
- {
- search += "and AA.route_code like '%'+@routecode+'%' ";
- dynamicParams.Add("@routecode", routecode);
- }
- if (routename != "" && routename != null)
- {
- search += "and AA.route_name like '%'+@routename+'%' ";
- dynamicParams.Add("@routename", routename);
}
if (partcode != "" && partcode != null)
{
@@ -213,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))+','
@@ -228,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