From c9826deec7b7d657df13c5382ba9af053ede4dff Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 18 八月 2025 18:34:02 +0800
Subject: [PATCH] 1、产测查询工单改为通过线体直接查询 2、产测sn新增接口添加周转码字段
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 364 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 257 insertions(+), 107 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index b0d1277..f32c386 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -39,12 +39,13 @@
//鍙栫洿鎺ュ叧鑱旂嚎浣撶殑浜ф祴鐧诲綍鍙锋暟鎹紝鍘诲彇鑾峰彇宸ュ崟
- 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";
return SQLHelper.ExecuteQuery(sql1);
}
@@ -83,50 +84,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,TURNOVER_CODE)
+ VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ '{asnInfo.tickeNo}',
+ '{asnInfo.snNo}',
+ '{asnInfo.workstationNo}',
+ '{asnInfo.snState}',
+ '{asnInfo.loginId}','{asnInfo.turnoverCode}')";
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,78 +210,115 @@
return result;
}
+
+
/// <summary>
- /// 璁剧疆涓鐮�
+ /// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
/// </summary>
- /// <param name="mesMiddleBox"></param>
- /// <returns></returns>
+ /// <param name="mesMiddleBox">涓鐮佸強SN鏁版嵁</param>
+ /// <returns>杩斿洖鎵ц鐘舵��</returns>
public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
{
var sqlHelper = new OracleSQLHelper();
- string[] msg= new string[2];
+ string[] msg = new string[2];
msg[0] = "true";
- //
+
var (connection, transaction) = sqlHelper.BeginTransaction();
try
{
- if (mesMiddleBox.type.ToUpper() =="A") {
+ if (mesMiddleBox.type.ToUpper() == "A") // 缁戝畾
+ {
if (mesMiddleBox.SnList.Count > 0)
{
- string sql1 = "select count(*) count from MES_MIDDLE_BOX where MEDIUMBOXCODE='"+ mesMiddleBox.MediumBoxCode + "'";
- DataTable data= sqlHelper.ExecuteQuery(sql1);
- if (data.Rows[0]["COUNT"].ToString() != "0") {
+ string sql1 = $"select count(*) count from MES_MIDDLE_BOX where MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
+ DataTable data = sqlHelper.ExecuteQuery(sql1);
+
+ if (data.Rows[0]["COUNT"].ToString() != "0")
+ {
msg[0] = "false";
msg[1] = "璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛�" + mesMiddleBox.MediumBoxCode;
transaction.Rollback();
-
return msg;
}
+
foreach (var item in mesMiddleBox.SnList)
{
- var sql2 = $@"INSERT INTO MES_MIDDLE_BOX
- (
- ID,
- MEDIUMBOXCODE,
- LOGIN_ID,
- SN_NO,
- TICKET_NO,
- CREATE_DATE,
- CREATED_BY
- )
- VALUES
- (
- SEQ_MES_MIDDLE_BOX_ID.NEXTVAL, -- 搴忓垪鐢熸垚涓婚敭
- '{mesMiddleBox.MediumBoxCode.ToString()}', -- 涓鐮�
- '{mesMiddleBox.LoginId}', -- 鐧诲綍鍙�
- '{item.SnNo}', -- SN鍙�
- '{item.TicketNo}', -- 宸ュ崟鍗曞彿
- SYSDATE, -- 鍒涘缓鏃堕棿
- '{mesMiddleBox.LoginId}' -- 鍒涘缓浜�
- )
- ";
+ string sqlInsert = $@"
+ INSERT INTO MES_MIDDLE_BOX (
+ ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY
+ ) VALUES (
+ SEQ_MES_MIDDLE_BOX_ID.NEXTVAL,
+ '{mesMiddleBox.MediumBoxCode}',
+ '{mesMiddleBox.LoginId}',
+ '{item.SnNo}',
+ '{item.TicketNo}',
+ SYSDATE,
+ '{mesMiddleBox.LoginId}'
+ )";
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);
+
+ // 鏃ュ織璁板綍鎻掑叆锛氭搷浣滅被鍨� 0锛堢粦瀹氾級
+ string logInsert = $@"
+ INSERT INTO MES_MIDDLE_BOX_LOG (
+ ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY, OPERATION_TYPE
+ ) VALUES (
+ MES_MIDDLE_BOX_LOG_ID.NEXTVAL,
+ '{mesMiddleBox.MediumBoxCode}',
+ '{mesMiddleBox.LoginId}',
+ '{item.SnNo}',
+ '{item.TicketNo}',
+ SYSDATE,
+ '{mesMiddleBox.LoginId}',
+ '0'
+ )";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
}
}
else
{
msg[0] = "false";
+ msg[1] = "SN鏄庣粏涓虹┖锛屾棤娉曠粦瀹氾紒";
}
- } else if(mesMiddleBox.type.ToUpper() == "F") {
- //瑙ｇ粦锛屾牴鎹腑绠辩爜鍏ㄩ儴鍒犻櫎
- var sql2 = $@"delete MES_MIDDLE_BOX where MEDIUMBOXCODE='{mesMiddleBox.MediumBoxCode}'";
+ }
+ else if (mesMiddleBox.type.ToUpper() == "F") // 瑙ｇ粦
+ {
+ // 鏌ヨ瑕佽В缁戠殑璁板綍
+ string sqlSelect = $@"
+ SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ DataTable dt = sqlHelper.ExecuteQuery(sqlSelect);
+
+ foreach (DataRow row in dt.Rows)
+ {
+ // 鎻掑叆瑙ｇ粦鏃ュ織锛氭搷浣滅被鍨� 1锛堣В缁戯級
+ string logInsert = $@"
+ INSERT INTO MES_MIDDLE_BOX_LOG (
+ ID, MEDIUMBOXCODE, LOGIN_ID, SN_NO, TICKET_NO, CREATE_DATE, CREATED_BY, OPERATION_TYPE
+ ) VALUES (
+ MES_MIDDLE_BOX_LOG_ID.NEXTVAL,
+ '{row["MEDIUMBOXCODE"]}',
+ '{row["LOGIN_ID"]}',
+ '{row["SN_NO"]}',
+ '{row["TICKET_NO"]}',
+ SYSDATE,
+ '{mesMiddleBox.LoginId}',
+ '1'
+ )";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
+ }
+
+ // 鎵ц瑙ｇ粦锛堝垹闄わ級
+ string sqlDelete = $@"DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
}
else
{
- msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
msg[0] = "false";
+ msg[1] = "鏃犳晥鐨勬搷浣滅被鍨嬶紒";
}
-
- // 鍏ㄩ儴鎴愬姛鎻愪氦
transaction.Commit();
}
catch (Exception ex)
@@ -226,77 +337,115 @@
}
+
+ /// <summary>
+ /// 璁剧疆鏍堟澘鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
+ /// </summary>
+ /// <param name="mesPalletBinding">缁戝畾鍙傛暟</param>
+ /// <returns>杩斿洖缁戝畾缁撴灉</returns>
public string[] SetStackCode(MesPalletBinding mesPalletBinding)
{
var sqlHelper = new OracleSQLHelper();
string[] msg = new string[2];
msg[0] = "true";
- //
+
var (connection, transaction) = sqlHelper.BeginTransaction();
try
{
- //缁戝畾
- if (mesPalletBinding.Type.ToUpper() == "A") {
+ // 缁戝畾
+ if (mesPalletBinding.Type.ToUpper() == "A")
+ {
if (mesPalletBinding.SnList.Count > 0)
{
- string sql1 = "select count(*) count from MES_PALLET_BINDING where STACKCODE='" + mesPalletBinding.StackCode + "'";
+ string sql1 = $"SELECT COUNT(*) COUNT FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
DataTable data = sqlHelper.ExecuteQuery(sql1);
+
if (data.Rows[0]["COUNT"].ToString() != "0")
{
msg[0] = "false";
msg[1] = "璇ユ爤鏉跨爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佹爤鏉跨爜锛�" + mesPalletBinding.StackCode;
transaction.Rollback();
-
return msg;
}
+
foreach (var item in mesPalletBinding.SnList)
{
- var sql2 = $@"INSERT INTO MES_PALLET_BINDING
- (
- ID,
- STACKCODE,
- LOGIN_ID,
- SN_NO,
- TICKET_NO,
- MEDIUMBOXCODE,
- CREATE_DATE,
- CREATED_BY
- )
- VALUES
- (
- SEQ_MES_PALLET_BINDING_ID.NEXTVAL, -- 搴忓垪鐢熸垚涓婚敭
- '{mesPalletBinding.StackCode}', -- 鏍堟澘鐮�
- '{mesPalletBinding.LoginId}', -- 鐧诲綍鍙�
- '{item.SnNo}', -- SN鍙�
- '{item.TicketNo}', -- 宸ュ崟鍗曞彿
- '{item.MediumBoxCode}', -- 涓鐮�
- SYSDATE, -- 鍒涘缓鏃堕棿
- '{mesPalletBinding.LoginId}' -- 鍒涘缓浜�
- )
+ string sqlInsert = $@"
+ INSERT INTO MES_PALLET_BINDING (
+ ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY
+ ) VALUES (
+ SEQ_MES_PALLET_BINDING_ID.NEXTVAL,
+ '{mesPalletBinding.StackCode}',
+ '{mesPalletBinding.LoginId}',
+ '{item.SnNo}',
+ '{item.TicketNo}',
+ '{item.MediumBoxCode}',
+ SYSDATE,
+ '{mesPalletBinding.LoginId}'
+ )";
- ";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ // 鎻掑叆缁戝畾鏃ュ織锛堟搷浣滅被鍨� 0锛�
+ string logInsert = $@"
+ INSERT INTO MES_PALLET_BINDING_LOG (
+ ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY, OPERATION_TYPE
+ ) VALUES (
+ MES_PALLET_BINDING_LOG_ID.NEXTVAL,
+ '{mesPalletBinding.StackCode}',
+ '{mesPalletBinding.LoginId}',
+ '{item.SnNo}',
+ '{item.TicketNo}',
+ '{item.MediumBoxCode}',
+ SYSDATE,
+ '{mesPalletBinding.LoginId}',
+ '0'
+ )";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
}
}
else
{
- msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
msg[0] = "false";
+ msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
}
}
- //瑙ｇ粦
- else if(mesPalletBinding.Type.ToUpper() == "F")
+ // 瑙ｇ粦
+ else if (mesPalletBinding.Type.ToUpper() == "F")
{
- //瑙ｇ粦锛屾牴鎹腑绠辩爜鍏ㄩ儴鍒犻櫎
- var sql2 = $@"delete MES_PALLET_BINDING where STACKCODE='" + mesPalletBinding.StackCode + "'";
+ // 鍏堟煡璇㈢粦瀹氱殑璁板綍
+ string sqlSelect = $"SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
+ DataTable dt = sqlHelper.ExecuteQuery( sqlSelect);
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ foreach (DataRow row in dt.Rows)
+ {
+ // 鎻掑叆瑙ｇ粦鏃ュ織锛堟搷浣滅被鍨� 1锛�
+ string logInsert = $@"
+ INSERT INTO MES_PALLET_BINDING_LOG (
+ ID, STACKCODE, LOGIN_ID, SN_NO, TICKET_NO, MEDIUMBOXCODE, CREATE_DATE, CREATED_BY, OPERATION_TYPE
+ ) VALUES (
+ MES_PALLET_BINDING_LOG_ID.NEXTVAL,
+ '{row["STACKCODE"]}',
+ '{row["LOGIN_ID"]}',
+ '{row["SN_NO"]}',
+ '{row["TICKET_NO"]}',
+ '{row["MEDIUMBOXCODE"]}',
+ SYSDATE,
+ '{mesPalletBinding.LoginId}',
+ '1'
+ )";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, logInsert);
+ }
+
+ // 鍒犻櫎缁戝畾璁板綍
+ string sqlDelete = $"DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
}
-
- // 鍏ㄩ儴鎴愬姛鎻愪氦
+ // 鎻愪氦浜嬪姟
transaction.Commit();
}
catch (Exception ex)
@@ -314,5 +463,6 @@
return msg;
}
+
}
}
--
Gitblit v1.9.3