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/WorkOrderDAL.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 68d7401..3ed3504 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -1047,12 +1047,16 @@
try
{
//MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
- sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend from (
- select top 1 wo_code from TK_Wrk_Man
- where wkshp_code=@wkshopcode and materiel_code=@partcode
- order by lm_date desc
- ) as A
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code";
+ sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
+ from TK_Wrk_Step S
+ inner join (
+ select top 1 A.wo_code from TK_Wrk_Man A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code
+ where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode
+ order by A.lm_date desc
+ ) as W on S.wo_code=W.wo_code
+ left join TStep T on S.step_code=T.stepcode
+ order by S.seq";
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@partcode", partcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
--
Gitblit v1.9.3