From 65c8842002adbf48b7bd2f30f503106c05263203 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 18 十一月 2022 13:27:09 +0800
Subject: [PATCH] 修改报工查询接口修改
---
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 3949ff3..a5c3496 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2351,22 +2351,16 @@
#region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepVerifySearch(string reporttype, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ 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 (reporttype != "" && reporttype != null)
+ if (verify != "" && verify != null)
{
- if (reporttype == "BZ")
- {
- search += "and AA.usergroup_code<>''";
- }
- else
- {
- search += "and AA.usergroup_code='' ";
- }
+ search += "and B.verify=@verify ";
+ dynamicParams.Add("@verify", verify);
}
if (wo_code != "" && wo_code != null)
{
@@ -2411,7 +2405,7 @@
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_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.usergroup_code,O.group_name as usergroup_name,B.report_person as usercode,U.username,
- B.report_date,B.report_qty,B.ng_qty,B.bad_qty
+ B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify
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
--
Gitblit v1.9.3