From 78ccddadb87e0d4dd7f74733a031393395db2869 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 五月 2024 14:38:39 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 184 +++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 868ee38..a57039c 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2607,102 +2607,102 @@
#region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛]
public static ToMessage MesOrderStepVerifySearch(string verify, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
- var dynamicParams = new DynamicParameters();
- string search = "";
- try
- {
- if (verify != "" && verify != null)
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
{
- search += "and AA.verify=@verify ";
- dynamicParams.Add("@verify", verify);
- }
- if (wo_code != "" && wo_code != null)
- {
- search += "and AA.wo_code like '%'+@wo_code+'%' ";
- dynamicParams.Add("@wo_code", wo_code);
- }
- if (partnumber != "" && partnumber != null)
- {
- search += "and AA.partnumber like '%'+@partnumber+'%' ";
- dynamicParams.Add("@partnumber", partnumber);
- }
- if (partname != "" && partname != null)
- {
- search += "and AA.partname like '%'+@partname+'%' ";
- dynamicParams.Add("@partname", partname);
- }
- if (partspec != "" && partspec != null)
- {
- search += "and AA.partspec like '%'+@partspec+'%' ";
- dynamicParams.Add("@partspec", partspec);
- }
- if (reportuser != "" && reportuser != null)
- {
- search += "and AA.usercode like '%'+@reportuser+'%' ";
- dynamicParams.Add("@reportuser", reportuser);
- }
- if (reportdateopendate != "" && reportdateopendate != null)
- {
- search += "and AA.report_date between @reportdateopendate and @reportdateclosedate ";
- dynamicParams.Add("@reportdateopendate", reportdateopendate + " 00:00:00");
- dynamicParams.Add("@reportdateclosedate", reportdateclosedate + " 23:59:59");
- }
+ if (verify != "" && verify != null)
+ {
+ search += "and AA.verify=@verify ";
+ dynamicParams.Add("@verify", verify);
+ }
+ if (wo_code != "" && wo_code != null)
+ {
+ search += "and AA.wo_code like '%'+@wo_code+'%' ";
+ dynamicParams.Add("@wo_code", wo_code);
+ }
+ if (partnumber != "" && partnumber != null)
+ {
+ search += "and AA.partnumber like '%'+@partnumber+'%' ";
+ dynamicParams.Add("@partnumber", partnumber);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and AA.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and AA.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (reportuser != "" && reportuser != null)
+ {
+ search += "and AA.usercode like '%'+@reportuser+'%' ";
+ dynamicParams.Add("@reportuser", reportuser);
+ }
+ if (reportdateopendate != "" && reportdateopendate != null)
+ {
+ search += "and AA.report_date between @reportdateopendate and @reportdateclosedate ";
+ dynamicParams.Add("@reportdateopendate", reportdateopendate + " 00:00:00");
+ dynamicParams.Add("@reportdateclosedate", reportdateclosedate + " 23:59:59");
+ }
- if (search == "")
- {
- search = "and 1=1 ";
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select * from(
+ select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
+ M.route_code,R.name as route_name,A.step_seq,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.report_person as usercode,U.username,
+ B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify,B.bad_money
+ from TK_Wrk_Record A
+ inner join TK_Wrk_RecordSub B on A.id=B.m_id
+ left join TK_Wrk_Man M on A.wo_code=M.wo_code
+ left join TStep S on A.step_code=S.stepcode
+ left join TWoPrteEqp_Stad T on A.wo_code=T.wo and A.materiel_code=T.materiel_code and A.eqp_code=T.eqp_code and A.step_code=T.step_code and M.route_code=T.route_code
+ left join TMateriel_Info P on A.materiel_code=P.partcode
+ left join TOrganization G on M.wkshp_code=G.org_code
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TFlw_Rout R on M.route_code=R.code
+ left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
+ left join TUser U on B.report_person=U.usercode
+ where A.style='B' and B.style='B' and M.status<>'CLOSED'
+ ) as AA where" + search;
+ //union all
+ //select A.id,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,G.org_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
+ //M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,'' as usergroup_code,'' as usergroup_name,B.in_person as usercode,U.username,
+ //B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.bad_qty
+ //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 TStep S on A.step_code = S.stepcode
+ //left join TPrteEqp_Stad T on A.materiel_code = T.materiel_code and M.route_code = T.route_code and A.step_code = T.step_code and A.wx_code = T.eqp_code
+ //left join TMateriel_Info P on A.materiel_code = P.partcode
+ //left join TOrganization G on M.wkshp_code = G.org_code
+ //left join TCustomer E on A.wx_code = E.code and E.btype = 'WX'
+ //left join TFlw_Rout R on M.route_code = R.code
+ //left join TFlw_Rtdt D on M.route_code = D.rout_code and A.step_code = D.step_code
+ //left join TUser U on B.in_person = U.usercode
+ //where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
- // --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
- var sql = @"select * from(
- select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
- M.route_code,R.name as route_name,A.step_seq,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.report_person as usercode,U.username,
- B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify,B.bad_money
- from TK_Wrk_Record A
- inner join TK_Wrk_RecordSub B on A.id=B.m_id
- left join TK_Wrk_Man M on A.wo_code=M.wo_code
- left join TStep S on A.step_code=S.stepcode
- left join TWoPrteEqp_Stad T on A.wo_code=T.wo and A.materiel_code=T.materiel_code and A.eqp_code=T.eqp_code and A.step_code=T.step_code and M.route_code=T.route_code
- left join TMateriel_Info P on A.materiel_code=P.partcode
- left join TOrganization G on M.wkshp_code=G.org_code
- left join TEqpInfo E on A.eqp_code=E.code
- left join TFlw_Rout R on M.route_code=R.code
- left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
- left join TUser U on B.report_person=U.usercode
- where A.style='B' and B.style='B' and M.status<>'CLOSED'
- ) as AA where" + search;
- //union all
- //select A.id,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,G.org_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
- //M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,'' as usergroup_code,'' as usergroup_name,B.in_person as usercode,U.username,
- //B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.bad_qty
- //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 TStep S on A.step_code = S.stepcode
- //left join TPrteEqp_Stad T on A.materiel_code = T.materiel_code and M.route_code = T.route_code and A.step_code = T.step_code and A.wx_code = T.eqp_code
- //left join TMateriel_Info P on A.materiel_code = P.partcode
- //left join TOrganization G on M.wkshp_code = G.org_code
- //left join TCustomer E on A.wx_code = E.code and E.btype = 'WX'
- //left join TFlw_Rout R on M.route_code = R.code
- //left join TFlw_Rtdt D on M.route_code = D.rout_code and A.step_code = D.step_code
- //left join TUser U on B.in_person = U.usercode
- //where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
- var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
- mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.count = total;
- mes.data = data.ToList();
- }
- catch (Exception e)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = e.Message;
- mes.data = null;
- }
- return mes;
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
}
#endregion
--
Gitblit v1.9.3