From b29370185ec3ca4debc6264d78c7159fe1d94b40 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 21 八月 2025 21:55:11 +0800
Subject: [PATCH] U9即时库存获取代码提交
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 7b4fa5f..05c7e3c 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();
//鏌ュ伐鍗曚俊鎭�
@@ -39,12 +39,15 @@
//鍙栫洿鎺ュ叧鑱旂嚎浣撶殑浜ф祴鐧诲綍鍙锋暟鎹紝鍘诲彇鑾峰彇宸ュ崟
- var sql1 = "select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from " +
- "MESLINE_LIKE_CCLOGIN_WORKS A1" +
- " join MES_LINE b on A1.LOGINID=b.ID" +
- " 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 from " +
+ // "MESLINE_LIKE_CCLOGIN_WORKS A1" +
+ // " join MES_LINE b on A1.LOGINID=b.ID" +
+ // " 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\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);
}
@@ -91,13 +94,13 @@
// 1. 涓昏〃鎻掑叆
var sql1 = $@"
INSERT INTO MES_SN_STATUS_DETAILS
- (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
+ (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID,TURNOVER_CODE)
VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
'{asnInfo.tickeNo}',
'{asnInfo.snNo}',
'{asnInfo.workstationNo}',
'{asnInfo.snState}',
- '{asnInfo.loginId}')";
+ '{asnInfo.loginId}','{asnInfo.turnoverCode}')";
int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);
// 2. 澶辫触椤规彃鍏�
--
Gitblit v1.9.3