From 16ed2221438c126755fc0b09308f26ddcbd9a2c4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 18 十一月 2022 16:52:28 +0800
Subject: [PATCH] 修改报工去掉班组
---
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index d774f08..fd8112f 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2404,7 +2404,7 @@
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_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,
+ 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
@@ -2417,7 +2417,6 @@
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
- left join TGroup O on U.usergroup_code=O.group_code
where A.style='B' and B.style='B' and M.status<>'CLOSED'
) as AA where" + search;
//union all
@@ -2785,7 +2784,7 @@
first_choke=json[i].first_choke.ToString(),
last_choke=json[i].last_choke.ToString(),
unprice=json[i].unprice.ToString(),
- usergroup_code=json[i].usergroup_code.ToString(),
+ usergroup_code="",
usercode=json[i].usercode.ToString(),
report_date=json[i].report_date.ToString(),
report_qty=json[i].report_qty.ToString(),
--
Gitblit v1.9.3