From 0b3c06f4d1bca7b91c2f5892a449bbbd3add4d27 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 19 八月 2025 10:29:19 +0800
Subject: [PATCH] 产测获取工单接口修改
---
StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs | 2 +-
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index f32c386..b389e65 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -19,7 +19,7 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public DataTable GetTickeInfo(string id)
+ public DataTable GetTickeInfo(string LineId,string LoginId)
{
OracleSQLHelper SQLHelper = new();
//鏌ュ伐鍗曚俊鎭�
@@ -45,7 +45,8 @@
// " left join WOMDAA C on C.DAA015=B.LINE_NO" +
// " left join mes_items s on s.id = C.daa002" +
// " where WORKSNO='" + id + "' and DAA018='宸插紑宸�' order by DAA016 asc";
- var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom WOMDAA C\r\n left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nwhere C.DAA015 = '" + id + "'\r\n and DAA018 = '宸插紑宸�' and A.CAA023='2'\r\norder by DAA016 asc";
+ //var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom WOMDAA C\r\n left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nwhere C.DAA015 = '" + LineId + "'\r\n and DAA018 = '宸插紑宸�' and A.CAA023='2'\r\norder by DAA016 asc";
+ var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom WOMDAA C\r\n left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nleft join MESPROJECT_LIKE_CCLOGIN pr1 on A.PROJECT=pr1.PROJECT_ID\r\nleft join MESLINE_LIKE_CCLOGIN_WORKS2 pr2 on pr1.id=pr2.LOGINID\r\nwhere C.DAA015 = '" + LineId + "' and pr2.WORKSNO='"+ LoginId + "'\r\n and DAA018 = '宸插紑宸�' and A.CAA023='2'\r\norder by DAA016 asc";
return SQLHelper.ExecuteQuery(sql1);
}
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs b/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
index 69616eb..b01caf4 100644
--- a/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
+++ b/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
@@ -44,7 +44,7 @@
dynamic resultInfos = new ExpandoObject();
//var result = m.GetTickeInfo(ccLoginDto.LoginId);
//浼犵嚎浣撶紪鐮侊紝鏍规嵁绾夸綋缂栫爜鑾峰彇宸ュ崟淇℃伅
- var result = m.GetTickeInfo(ccLoginDto.LineId);
+ var result = m.GetTickeInfo(ccLoginDto.LineId, ccLoginDto.LoginId);
resultInfos.tbBillList = result;
entity.Result = 0;
--
Gitblit v1.9.3