From 8fdbaa96f141543fe9f6210975734809a209a0c8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 六月 2024 15:03:16 +0800
Subject: [PATCH] 1.报工增加按序和不按序报工操作，工序调整增加按序和不按序报工调整 2.增加SOP管理：设备SOP管理、工艺SOP管理功能
---
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 3f51867..5ab8f29 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -3448,7 +3448,7 @@
where S.materiel_code=@partcode
union all
select materiel_code,step_seq,step_code,'0' as unprice,isbott,isend from TMateriel_Step
- where materiel_code+step_code
+ where materiel_code=@partcode and materiel_code+step_code
not in(select materiel_code+step_code from TPrteEqp_Stad
where materiel_code=@partcode)
) as A
@@ -3546,11 +3546,12 @@
total = 0; //鎬绘潯鏁�
sql = @"select * from (
select A.id,A.materiel_code as partcode,B.partname,B.partspec,A.route_code,C.name as route_name,
- D.stepcode,D.stepname,A.unprice
+ D.stepcode,D.stepname,A.unprice,U.username as lm_user,A.lm_date
from TPrteEqp_Stad A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TFlw_Rout C on A.route_code=C.code
left join TStep D on A.step_code=D.stepcode
+ left join TUser U on A.lm_user=U.usercode
) as AA where" + search;
}
else //宸ュ簭鐗�
@@ -3558,10 +3559,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
total = 0; //鎬绘潯鏁�
sql = @"select * from (
- select A.id,A.materiel_code as partcode,B.partname,B.partspec,D.stepcode,D.stepname,A.unprice
+ select A.id,A.materiel_code as partcode,B.partname,B.partspec,D.stepcode,D.stepname,A.unprice,U.username as lm_user,A.lm_date
from TPrteEqp_Stad A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TStep D on A.step_code=D.stepcode
+ left join TUser U on A.lm_user=U.usercode
) as AA where" + search;
}
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
--
Gitblit v1.9.3