From 166ff0158bf60a2554047fcd32721ed7ea968874 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期三, 13 八月 2025 18:05:39 +0800
Subject: [PATCH] 产测配件绑定代码提交
---
StandardPda/MES.Service/Dto/service/AsnInfo.cs | 32 ++++++++++
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 125 +++++++++++++++++++++++++++++++++--------
StandardPda/MES.Service/DB/OracleSQLHelper.cs | 14 ++++
3 files changed, 146 insertions(+), 25 deletions(-)
diff --git a/StandardPda/MES.Service/DB/OracleSQLHelper.cs b/StandardPda/MES.Service/DB/OracleSQLHelper.cs
index ae4fccc..fea808c 100644
--- a/StandardPda/MES.Service/DB/OracleSQLHelper.cs
+++ b/StandardPda/MES.Service/DB/OracleSQLHelper.cs
@@ -246,5 +246,19 @@
connection.Dispose();
}
}
+ public object ExecuteScalarWithTransaction(OracleConnection conn, OracleTransaction tran, string sql, params OracleParameter[] parameters)
+ {
+ using (var cmd = conn.CreateCommand())
+ {
+ cmd.Transaction = tran;
+ cmd.CommandText = sql;
+ if (parameters != null)
+ {
+ cmd.Parameters.AddRange(parameters);
+ }
+ return cmd.ExecuteScalar();
+ }
+ }
+
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/service/AsnInfo.cs b/StandardPda/MES.Service/Dto/service/AsnInfo.cs
index 4a948e3..f4947c0 100644
--- a/StandardPda/MES.Service/Dto/service/AsnInfo.cs
+++ b/StandardPda/MES.Service/Dto/service/AsnInfo.cs
@@ -29,6 +29,12 @@
public List<CcFailItems>? failItems { get; set; }
+ /// <summary>
+ /// 閰嶄欢缁戝畾
+ /// </summary>
+ public List<AccessoryList>? accessoryList { get; set; }
+
+
}
/// <summary>
/// 浜ф祴SN澶辫触椤规槑缁嗚〃
@@ -59,4 +65,30 @@
}
+ /// <summary>
+ /// 閰嶄欢鏄庣粏
+ /// </summary>
+ public class AccessoryList
+ {
+
+ /// <summary>
+ /// 缁戝畾鐘舵�侊紙(0:缁戝畾, 1:瑙ｇ粦锛�
+ /// </summary>
+ public string? bindingState { get; set; }
+
+ /// <summary>
+ /// 閰嶄欢SN鍙�
+ /// </summary>
+ public string? accessorySn { get; set; }
+
+ /// <summary>
+ ///閰嶄欢涓枃鍚箟
+ /// </summary>
+ public string? accessoryName { get; set; }
+
+
+
+
+ }
+
}
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index b85f6cd..7b4fa5f 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -83,50 +83,123 @@
{
var sqlHelper = new OracleSQLHelper();
bool result = true;
- //
+
var (connection, transaction) = sqlHelper.BeginTransaction();
try
{
- // 涓昏〃鎻掑叆
- var sql1 = $@"INSERT INTO MES_SN_STATUS_DETAILS
- (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
- VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
- '{asnInfo.tickeNo}',
- '{asnInfo.snNo}',
- '{asnInfo.workstationNo}',
- '{asnInfo.snState}',
- '{asnInfo.loginId}')";
-
+ // 1. 涓昏〃鎻掑叆
+ var sql1 = $@"
+ INSERT INTO MES_SN_STATUS_DETAILS
+ (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
+ VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ '{asnInfo.tickeNo}',
+ '{asnInfo.snNo}',
+ '{asnInfo.workstationNo}',
+ '{asnInfo.snState}',
+ '{asnInfo.loginId}')";
int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);
+ // 2. 澶辫触椤规彃鍏�
if (i > 0 && asnInfo.failItems?.Count > 0)
{
foreach (var item in asnInfo.failItems)
{
- var sql2 = $@"INSERT INTO CC_FAIL_ITEMS
- (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
- VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
- SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
- '{item.DefectIssue}',
- '{item.RootCause}',
- '{item.RepairMethod}',
- '{item.MaterialHandling}',
- SYSDATE,
- '{asnInfo.loginId}')";
-
+ var sql2 = $@"
+ INSERT INTO CC_FAIL_ITEMS
+ (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
+ VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
+ SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
+ '{item.DefectIssue}',
+ '{item.RootCause}',
+ '{item.RepairMethod}',
+ '{item.MaterialHandling}',
+ SYSDATE,
+ '{asnInfo.loginId}')";
sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
}
}
- // 鍏ㄩ儴鎴愬姛鎻愪氦
+ // 3. 閰嶄欢缁戝畾/瑙ｇ粦 & 鏃ュ織璁板綍
+ if (asnInfo.accessoryList?.Count > 0)
+ {
+ foreach (var accessory in asnInfo.accessoryList)
+ {
+ var now = "SYSDATE";
+ var user = asnInfo.loginId;
+ var snNo = asnInfo.snNo;
+ var partSn = accessory.accessorySn;
+ var partName = accessory.accessoryName;
+
+ if (accessory.bindingState == "0")
+ {
+ // ====== 鏍￠獙锛氬悓涓�涓厤浠禨N鏄惁宸茬粦瀹� ======
+ var checkSql = $@"
+ SELECT COUNT(1) FROM MES_SN_PART_BINDING
+ WHERE PART_SN_NO = '{partSn}'";
+ var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql));
+ if (exists > 0)
+ {
+ throw new Exception($"閰嶄欢SN[{partSn}]宸茬粦瀹氾紝璇峰厛瑙ｇ粦鍐嶇粦瀹氾紒");
+ }
+
+ // 缁戝畾
+ var sqlBind = $@"
+ INSERT INTO MES_SN_PART_BINDING
+ (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
+ VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
+ '{snNo}',
+ '{partSn}',
+ '{partName}',
+ {now},
+ '{user}')";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlBind);
+
+ // 鏃ュ織
+ var sqlLog = $@"
+ INSERT INTO MES_SN_PART_BINDING_LOG
+ (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
+ VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
+ '{snNo}',
+ '{partSn}',
+ '{partName}',
+ {now},
+ '{user}',
+ 0)";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
+ }
+ else if (accessory.bindingState == "1")
+ {
+ // 瑙ｇ粦
+ var sqlUnbind = $@"
+ DELETE FROM MES_SN_PART_BINDING
+ WHERE SN_NO = '{snNo}'
+ AND PART_SN_NO = '{partSn}'";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlUnbind);
+
+ // 鏃ュ織
+ var sqlLog = $@"
+ INSERT INTO MES_SN_PART_BINDING_LOG
+ (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER, OP_TYPE)
+ VALUES (SEQ_MES_SN_PART_BINDING_LOG.NEXTVAL,
+ '{snNo}',
+ '{partSn}',
+ '{partName}',
+ {now},
+ '{user}',
+ 1)";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlLog);
+ }
+ }
+ }
+
transaction.Commit();
}
- catch (Exception ex)
+ catch (Exception)
{
transaction.Rollback();
result = false;
- throw; // 寤鸿璁板綍鏃ュ織
+ throw;
}
finally
{
@@ -136,6 +209,8 @@
return result;
}
+
+
/// <summary>
/// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
/// </summary>
--
Gitblit v1.9.3