From 1cb5959adf96911101864488a67e8b31b8de658f Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 08 八月 2025 15:31:38 +0800
Subject: [PATCH] 产测中箱码、栈板码绑定sn添加日志表记录
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 343 insertions(+), 14 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 602a24d..b85f6cd 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -2,12 +2,13 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.service.BasicData;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using System.Data;
namespace MES.Service.service.Warehouse
{
@@ -26,16 +27,24 @@
// join MES_LINE b on A.LINEID=b.ID
// left join WOMDAA C on C.DAA015=B.LINE_NO
// left join mes_items s on s.id = C.daa002
- // where LOGINID='" + id+ "' and DAA018='宸插紑宸�' order by DAA016 asc";
+ // where LOGINID='" + 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 A
- left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
- join MES_LINE b on A.LINEID=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 A
+ // left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
+ // join MES_LINE b on A.LINEID=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";
return SQLHelper.ExecuteQuery(sql1);
}
@@ -45,18 +54,338 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
+ //public bool AddAsnInfo(AsnInfo asnInfo)
+ //{
+ // OracleSQLHelper SQLHelper = new();
+ // //璁板綍浜ф祴杩囩珯淇℃伅
+ // 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+"')";
+ // bool result = true;
+ // int i= SQLHelper.ExecuteNonQuery(sql1);
+ // //涓昏〃淇℃伅鎻掑叆鎴愬姛锛岀户缁彃鍏ラ」鐩�
+ // if (i > 0) {
+ // //鍒ゆ柇椤圭洰鏄惁涓虹┖锛屼负绌轰笉鎻掑叆
+ // if (asnInfo.failItems.Count>0)
+ // {
+ // //鎻掑叆閫昏緫
+
+ // }
+ // else
+ // {
+ // result = true;
+ // }
+
+
+ // } else { result = false; }
+
+ // return result;
+ //}
public bool AddAsnInfo(AsnInfo asnInfo)
{
- OracleSQLHelper SQLHelper = new();
- //璁板綍浜ф祴杩囩珯淇℃伅
- var sql1 = @"INSERT INTO MES_SN_STATUS_DETAILS (ID,TICKET_NO,SN_NO,WORKSTATION_NO,SN_STATE) VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,'"+ asnInfo.tickeNo+ "','"+ asnInfo.snNo+ "','"+ asnInfo.workstationNo+ "','"+ asnInfo.snState+ "')";
+ var sqlHelper = new OracleSQLHelper();
bool result = true;
- int i= SQLHelper.ExecuteNonQuery(sql1);
- if (i > 0) {result = true;} else { result = false; }
-
+ //
+ 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}')";
+
+ int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);
+
+ 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}')";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ }
+ }
+
+ // 鍏ㄩ儴鎴愬姛鎻愪氦
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ result = false;
+ throw; // 寤鸿璁板綍鏃ュ織
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
+ }
+
return result;
}
+ /// <summary>
+ /// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
+ /// </summary>
+ /// <param name="mesMiddleBox">涓鐮佸強SN鏁版嵁</param>
+ /// <returns>杩斿洖鎵ц鐘舵��</returns>
+ public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
+ {
+ var sqlHelper = new OracleSQLHelper();
+ string[] msg = new string[2];
+ msg[0] = "true";
+
+ var (connection, transaction) = sqlHelper.BeginTransaction();
+
+ try
+ {
+ 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")
+ {
+ msg[0] = "false";
+ msg[1] = "璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛�" + mesMiddleBox.MediumBoxCode;
+ transaction.Rollback();
+ return msg;
+ }
+
+ foreach (var item in mesMiddleBox.SnList)
+ {
+ 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, 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") // 瑙ｇ粦
+ {
+ // 鏌ヨ瑕佽В缁戠殑璁板綍
+ string sqlSelect = $@"
+ SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
+
+ 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[0] = "false";
+ msg[1] = "鏃犳晥鐨勬搷浣滅被鍨嬶紒";
+ }
+
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ msg[0] = "false";
+ msg[1] = ex.Message;
+ throw; // 寤鸿璁板綍鏃ュ織
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
+ }
+
+ return msg;
+ }
+
+
+
+ /// <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.SnList.Count > 0)
+ {
+ 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)
+ {
+ 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);
+
+ // 鎻掑叆缁戝畾鏃ュ織锛堟搷浣滅被鍨� 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[0] = "false";
+ msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
+ }
+ }
+ // 瑙ｇ粦
+ else if (mesPalletBinding.Type.ToUpper() == "F")
+ {
+ // 鍏堟煡璇㈢粦瀹氱殑璁板綍
+ string sqlSelect = $"SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
+ DataTable dt = sqlHelper.ExecuteQuery( sqlSelect);
+
+ 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)
+ {
+ transaction.Rollback();
+ msg[0] = "false";
+ msg[1] = ex.Message;
+ throw; // 寤鸿璁板綍鏃ュ織
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
+ }
+
+ return msg;
+ }
}
--
Gitblit v1.9.3