From a1f71e49394fdfed07b22d2760667387e0bef65c Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 12 九月 2025 11:29:21 +0800
Subject: [PATCH] 产测获取工单接口添加条件，已经终止的单据不允许获取
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index acc7ce0..5502fef 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -47,7 +47,7 @@
// " 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 = '" + 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";
+ 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' and nvl(a.ISCANCEL,0) <>1 \r\norder by DAA016 asc";
return SQLHelper.ExecuteQuery(sql1);
}
@@ -222,17 +222,32 @@
try
{
// 1. 涓昏〃鎻掑叆
+ // var sql1 = @"
+ //INSERT INTO MES_SN_STATUS_DETAILS
+ // (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE,LINE_NO)
+ // VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ // :ticketNo,
+ // :snNo,
+ // :workstationNo,
+ // :snState,
+ // :loginId,
+ // :turnoverCode,select nvl(DAA015,'') from WOMDAA where DAA001 = ':ticketNo' and ROWNUM=1)";
+
+ // 1. 涓昏〃鎻掑叆
var sql1 = @"
INSERT INTO MES_SN_STATUS_DETAILS
- (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE)
- VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
- :ticketNo,
- :snNo,
- :workstationNo,
- :snState,
- :loginId,
- :turnoverCode)";
-
+ (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE, LINE_NO)
+ SELECT SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ :ticketNo,
+ :snNo,
+ :workstationNo,
+ :snState,
+ :loginId,
+ :turnoverCode,
+ NVL(DAA015, '')
+ FROM WOMDAA
+ WHERE DAA001 = :ticketNo
+ AND ROWNUM = 1";
var parameters1 = new[]
{
new OracleParameter("ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
--
Gitblit v1.9.3