From a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 16a49d8..f617651 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -47,7 +47,15 @@
// " 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 ,PRD.PRD_ID PRDID\r\nfrom WOMDAA C\r\n " +
+ "left join mes_items s on s.id = C.daa002\r\n" +
+ "left join MES_PRD_ID PRD on PRD.ITEM_NO=s.ITEM_NO /*鏌ヨ浜у搧id*/\r\n" +
+ "left join womcaa A on A.caa001=C.daa021\r\n" +
+ "left join MESPROJECT_LIKE_CCLOGIN pr1 on A.PROJECT=pr1.PROJECT_ID\r\n" +
+ "left join MESLINE_LIKE_CCLOGIN_WORKS2 pr2 on pr1.id=pr2.LOGINID\r\n" +
+ "left join MES_LINE_ORDER lo on lo.order_no=c.daa001 " +
+ "where C.DAA015 = '" + LineId + "' and pr2.WORKSNO='" + LoginId + "'\r\n and DAA018 = '宸插紑宸�' and A.CAA023='2' and lo.line_no='" + LineId + "'\r\n" +
+ "order by DAA016 asc";
return SQLHelper.ExecuteQuery(sql1);
}
@@ -742,5 +750,32 @@
return result;
}
+ /// <summary>
+ /// 鏌ヨ鏍堟澘鐮佺姸鎬�
+ /// </summary>
+ /// <param name="stackCode">鏍堟澘鐮�</param>
+ /// <returns>0-鍏佽瑙ｇ粦锛�1-涓嶅厑璁歌В缁�(宸插叆搴�)</returns>
+ public int GetStackCodeState(string stackCode)
+ {
+ var sqlHelper = new OracleSQLHelper();
+ try
+ {
+ // 鏌ヨ璇ユ爤鏉跨爜鏄惁宸插叆搴� (IS_INBOUND = 1)
+ var sql = @"SELECT COUNT(*) FROM MES_PALLET_BINDING
+ WHERE STACKCODE = :stackCode AND IS_INBOUND = 1";
+ var parameters = new[] { new OracleParameter(":stackCode", stackCode ?? (object)DBNull.Value) };
+
+ var count = Convert.ToInt32(sqlHelper.ExecuteScalar(sql, CommandType.Text, parameters));
+
+ // 濡傛灉count > 0锛岃鏄庡凡鍏ュ簱锛岃繑鍥�1(涓嶅厑璁歌В缁�)
+ // 鍚﹀垯杩斿洖0(鍏佽瑙ｇ粦)
+ return count > 0 ? 1 : 0;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ鏍堟澘鐮佺姸鎬佸け璐�: {ex.Message}", ex);
+ }
+ }
+
}
}
--
Gitblit v1.9.3