From 0b3c06f4d1bca7b91c2f5892a449bbbd3add4d27 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 19 八月 2025 10:29:19 +0800
Subject: [PATCH] 产测获取工单接口修改
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 141 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 109 insertions(+), 32 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index b85f6cd..b389e65 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,14 @@
//鍙栫洿鎺ュ叧鑱旂嚎浣撶殑浜ф祴鐧诲綍鍙锋暟鎹紝鍘诲彇鑾峰彇宸ュ崟
- 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 = '" + 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";
return SQLHelper.ExecuteQuery(sql1);
}
@@ -83,50 +85,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,6 +211,8 @@
return result;
}
+
+
/// <summary>
/// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
/// </summary>
--
Gitblit v1.9.3