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 | 659 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 486 insertions(+), 173 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index f32c386..f617651 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -3,6 +3,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.BasicData;
+using Oracle.ManagedDataAccess.Client;
using System;
using System.Collections.Generic;
using System.Data;
@@ -19,7 +20,7 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public DataTable GetTickeInfo(string id)
+ public DataTable GetTickeInfo(string LineId, string LoginId)
{
OracleSQLHelper SQLHelper = new();
//鏌ュ伐鍗曚俊鎭�
@@ -45,7 +46,16 @@
// " 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";
+ //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 ,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);
}
@@ -80,6 +90,136 @@
// return result;
//}
+ //public bool AddAsnInfo(AsnInfo asnInfo)
+ //{
+ // var sqlHelper = new OracleSQLHelper();
+ // bool result = true;
+
+ // var (connection, transaction) = sqlHelper.BeginTransaction();
+
+ // try
+ // {
+ // // 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}')";
+ // 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)
+ // {
+ // transaction.Rollback();
+ // result = false;
+ // throw;
+ // }
+ // finally
+ // {
+ // sqlHelper.CloseConnection(connection);
+ // }
+
+ // return result;
+ //}
+
public bool AddAsnInfo(AsnInfo asnInfo)
{
var sqlHelper = new OracleSQLHelper();
@@ -90,34 +230,71 @@
try
{
// 1. 涓昏〃鎻掑叆
- var sql1 = $@"
+ // var sql1 = @"
+ //INSERT INTO MES_SN_STATUS_DETAILS
+ // (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE,LINE_NO)
+ // VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ // :ticketNo,
+ // :snNo,
+ // :workstationNo,
+ // :snState,
+ // :loginId,
+ // :turnoverCode,select nvl(DAA015,'') from WOMDAA where DAA001 = ':ticketNo' and ROWNUM=1)";
+
+ // 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);
+ (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID, TURNOVER_CODE, LINE_NO)
+ SELECT SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
+ :ticketNo,
+ :snNo,
+ :workstationNo,
+ :snState,
+ :loginId,
+ :turnoverCode,
+ NVL(DAA015, '')
+ FROM WOMDAA
+ WHERE DAA001 = :ticketNo
+ AND ROWNUM = 1";
+ var parameters1 = new[]
+ {
+ new OracleParameter("ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
+ new OracleParameter("snNo", asnInfo.snNo ?? (object)DBNull.Value),
+ new OracleParameter("workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
+ new OracleParameter("snState", asnInfo.snState ?? (object)DBNull.Value),
+ new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value),
+ new OracleParameter("turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value)
+ };
+
+ int i = sqlHelper.ExecuteNonQueryWithTransaction(sql1, parameters1, connection, transaction);
// 2. 澶辫触椤规彃鍏�
if (i > 0 && asnInfo.failItems?.Count > 0)
{
foreach (var item in asnInfo.failItems)
{
- var sql2 = $@"
+ 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);
+ (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,
+ :defectIssue,
+ :rootCause,
+ :repairMethod,
+ :materialHandling,
+ SYSDATE,
+ :loginId)";
+
+ var parameters2 = new[]
+ {
+ new OracleParameter("defectIssue", item.DefectIssue ?? (object)DBNull.Value),
+ new OracleParameter("rootCause", item.RootCause ?? (object)DBNull.Value),
+ new OracleParameter("repairMethod", item.RepairMethod ?? (object)DBNull.Value),
+ new OracleParameter("materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
+ new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value)
+ };
+
+ sqlHelper.ExecuteNonQueryWithTransaction(sql2, parameters2, connection, transaction);
}
}
@@ -126,70 +303,96 @@
{
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;
+ var user = asnInfo.loginId;
- if (accessory.bindingState == "0")
+ 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));
+ // 鏍￠獙
+ var checkSql = "SELECT COUNT(1) FROM MES_SN_PART_BINDING WHERE PART_SN_NO = :partSn";
+ var checkParams = new[] { new OracleParameter("partSn", partSn ?? (object)DBNull.Value) };
+ var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql, checkParams));
+
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 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,
+ SYSDATE,
+ :createUser)";
- // 鏃ュ織
- var sqlLog = $@"
+ var bindParams = new[]
+ {
+ new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
+ new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
+ new OracleParameter("partName", partName ?? (object)DBNull.Value),
+ new OracleParameter("createUser", user ?? (object)DBNull.Value)
+};
+
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlBind, bindParams, connection, transaction);
+
+
+ // 鎻掑叆鏃ュ織
+ 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);
+ (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,
+ SYSDATE,
+ :createUser,
+ 0)";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, bindParams, connection, transaction);
}
- else if (accessory.bindingState == "1")
+ else if (accessory.bindingState == "1") // 瑙ｇ粦
{
- // 瑙ｇ粦
- var sqlUnbind = $@"
+ // 鍒犻櫎缁戝畾
+ var sqlUnbind = @"
DELETE FROM MES_SN_PART_BINDING
- WHERE SN_NO = '{snNo}'
- AND PART_SN_NO = '{partSn}'";
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlUnbind);
+ WHERE SN_NO = :snNo
+ AND PART_SN_NO = :partSn";
- // 鏃ュ織
- var sqlLog = $@"
+ var unbindParams = new[]
+ {
+ new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
+ new OracleParameter("partSn", partSn ?? (object)DBNull.Value)
+ };
+
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind, unbindParams, connection, transaction);
+
+ // 鎻掑叆鏃ュ織
+ 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);
+ (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,
+ SYSDATE,
+ :Puser,
+ 1)";
+
+ var logParams = new[]
+ {
+ new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
+ new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
+ new OracleParameter("partName", partName ?? (object)DBNull.Value),
+ new OracleParameter("Puser", user ?? (object)DBNull.Value)
+ };
+
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
}
}
}
@@ -215,8 +418,6 @@
/// <summary>
/// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
/// </summary>
- /// <param name="mesMiddleBox">涓鐮佸強SN鏁版嵁</param>
- /// <returns>杩斿洖鎵ц鐘舵��</returns>
public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
{
var sqlHelper = new OracleSQLHelper();
@@ -231,49 +432,54 @@
{
if (mesMiddleBox.SnList.Count > 0)
{
- string sql1 = $"select count(*) count from MES_MIDDLE_BOX where MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
- DataTable data = sqlHelper.ExecuteQuery(sql1);
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪
+ var sqlCheck = "SELECT COUNT(*) FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
+ var checkParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
+ var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));
- if (data.Rows[0]["COUNT"].ToString() != "0")
+ if (count > 0)
{
msg[0] = "false";
- msg[1] = "璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛�" + mesMiddleBox.MediumBoxCode;
+ msg[1] = $"璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛歿mesMiddleBox.MediumBoxCode}";
transaction.Rollback();
return msg;
}
foreach (var item in mesMiddleBox.SnList)
{
- string sqlInsert = $@"
+ // 鎻掑叆缁戝畾
+ var 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}'
- )";
+ :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy)";
+ var insertParams = new[]
+ {
+ new OracleParameter(":code", mesMiddleBox.MediumBoxCode),
+ new OracleParameter(":loginId", mesMiddleBox.LoginId),
+ new OracleParameter(":snNo", item.SnNo),
+ new OracleParameter(":ticketNo", item.TicketNo),
+ new OracleParameter(":createdBy", mesMiddleBox.LoginId)
+ };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlInsert, insertParams, connection, transaction);
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);
-
- // 鏃ュ織璁板綍鎻掑叆锛氭搷浣滅被鍨� 0锛堢粦瀹氾級
- string logInsert = $@"
+ // 鎻掑叆鏃ュ織
+ var sqlLog = @"
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);
+ :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy, 0)";
+ var logParams = new[]
+ {
+ new OracleParameter(":code", mesMiddleBox.MediumBoxCode),
+ new OracleParameter(":loginId", mesMiddleBox.LoginId),
+ new OracleParameter(":snNo", item.SnNo),
+ new OracleParameter(":ticketNo", item.TicketNo),
+ new OracleParameter(":createdBy", mesMiddleBox.LoginId)
+ };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
}
}
else
@@ -284,34 +490,32 @@
}
else if (mesMiddleBox.type.ToUpper() == "F") // 瑙ｇ粦
{
- // 鏌ヨ瑕佽В缁戠殑璁板綍
- string sqlSelect = $@"
- SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
-
- DataTable dt = sqlHelper.ExecuteQuery(sqlSelect);
+ var sqlSelect = "SELECT * FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
+ var selectParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
+ var dt = sqlHelper.ExecuteDataTable(sqlSelect, CommandType.Text, selectParams);
foreach (DataRow row in dt.Rows)
{
- // 鎻掑叆瑙ｇ粦鏃ュ織锛氭搷浣滅被鍨� 1锛堣В缁戯級
- string logInsert = $@"
+ var sqlLog = @"
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);
+ :code, :loginId, :snNo, :ticketNo, SYSDATE, :createdBy, 1)";
+ var logParams = new[]
+ {
+ new OracleParameter(":code", row["MEDIUMBOXCODE"]),
+ new OracleParameter(":loginId", row["LOGIN_ID"]),
+ new OracleParameter(":snNo", row["SN_NO"]),
+ new OracleParameter(":ticketNo", row["TICKET_NO"]),
+ new OracleParameter(":createdBy", mesMiddleBox.LoginId)
+ };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
}
- // 鎵ц瑙ｇ粦锛堝垹闄わ級
- string sqlDelete = $@"DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = '{mesMiddleBox.MediumBoxCode}'";
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
+ var sqlDelete = "DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
+ var delParams = new[] { new OracleParameter(":code", mesMiddleBox.MediumBoxCode) };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlDelete, delParams, connection, transaction);
}
else
{
@@ -326,7 +530,7 @@
transaction.Rollback();
msg[0] = "false";
msg[1] = ex.Message;
- throw; // 寤鸿璁板綍鏃ュ織
+ throw;
}
finally
{
@@ -336,13 +540,9 @@
return msg;
}
-
-
/// <summary>
/// 璁剧疆鏍堟澘鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
/// </summary>
- /// <param name="mesPalletBinding">缁戝畾鍙傛暟</param>
- /// <returns>杩斿洖缁戝畾缁撴灉</returns>
public string[] SetStackCode(MesPalletBinding mesPalletBinding)
{
var sqlHelper = new OracleSQLHelper();
@@ -353,57 +553,48 @@
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}'";
- DataTable data = sqlHelper.ExecuteQuery(sql1);
+ var sqlCheck = "SELECT COUNT(*) FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
+ var checkParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
+ var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));
- if (data.Rows[0]["COUNT"].ToString() != "0")
+ if (count > 0)
{
msg[0] = "false";
- msg[1] = "璇ユ爤鏉跨爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佹爤鏉跨爜锛�" + mesPalletBinding.StackCode;
+ msg[1] = $"璇ユ爤鏉跨爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佹爤鏉跨爜锛歿mesPalletBinding.StackCode}";
transaction.Rollback();
return msg;
}
foreach (var item in mesPalletBinding.SnList)
{
- string sqlInsert = $@"
+ var 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}'
- )";
+ :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy)";
+ var insertParams = new[]
+ {
+ new OracleParameter(":stackCode", mesPalletBinding.StackCode),
+ new OracleParameter(":loginId", mesPalletBinding.LoginId),
+ new OracleParameter(":snNo", item.SnNo),
+ new OracleParameter(":ticketNo", item.TicketNo),
+ new OracleParameter(":mediumBoxCode", item.MediumBoxCode),
+ new OracleParameter(":createdBy", mesPalletBinding.LoginId)
+ };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlInsert, insertParams, connection, transaction);
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlInsert);
-
- // 鎻掑叆缁戝畾鏃ュ織锛堟搷浣滅被鍨� 0锛�
- string logInsert = $@"
+ var sqlLog = @"
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);
+ :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy, 0)";
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, insertParams, connection, transaction);
}
}
else
@@ -412,40 +603,49 @@
msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
}
}
- // 瑙ｇ粦
- else if (mesPalletBinding.Type.ToUpper() == "F")
+ else if (mesPalletBinding.Type.ToUpper() == "F") // 瑙ｇ粦
{
- // 鍏堟煡璇㈢粦瀹氱殑璁板綍
- string sqlSelect = $"SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
- DataTable dt = sqlHelper.ExecuteQuery( sqlSelect);
+ var sqlCheck = "SELECT COUNT(*) FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode AND IS_INBOUND = 1";
+ var checkParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
+ var count = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, sqlCheck, checkParams));
+
+ if (count > 0)
+ {
+ msg[0] = "false";
+ msg[1] = $"璇ユ爤鏉跨爜宸茬粡鍦∕ES鍏ュ簱锛屼笉鍏佽瑙ｇ粦锛佹爤鏉跨爜锛歿mesPalletBinding.StackCode}";
+ transaction.Rollback();
+ return msg;
+ }
+
+ var sqlSelect = "SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
+ var selectParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
+ var dt = sqlHelper.ExecuteDataTable(sqlSelect, CommandType.Text, selectParams);
foreach (DataRow row in dt.Rows)
{
- // 鎻掑叆瑙ｇ粦鏃ュ織锛堟搷浣滅被鍨� 1锛�
- string logInsert = $@"
+ var sqlLog = @"
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);
+ :stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy, 1)";
+ var logParams = new[]
+ {
+ new OracleParameter(":stackCode", row["STACKCODE"]),
+ new OracleParameter(":loginId", row["LOGIN_ID"]),
+ new OracleParameter(":snNo", row["SN_NO"]),
+ new OracleParameter(":ticketNo", row["TICKET_NO"]),
+ new OracleParameter(":mediumBoxCode", row["MEDIUMBOXCODE"]),
+ new OracleParameter(":createdBy", mesPalletBinding.LoginId)
+ };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
}
- // 鍒犻櫎缁戝畾璁板綍
- string sqlDelete = $"DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
- sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sqlDelete);
+ var sqlDelete = "DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
+ var delParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlDelete, delParams, connection, transaction);
}
- // 鎻愪氦浜嬪姟
transaction.Commit();
}
catch (Exception ex)
@@ -453,7 +653,7 @@
transaction.Rollback();
msg[0] = "false";
msg[1] = ex.Message;
- throw; // 寤鸿璁板綍鏃ュ織
+ throw;
}
finally
{
@@ -464,5 +664,118 @@
}
+ /// <summary>
+ /// 澶勭悊瑙ｇ粦 / 鎾ら攢瑙ｇ粦
+ /// </summary>
+ public bool ProcessSn(UnbindAsnInfoDto dto)
+ {
+ if (dto == null || dto.snList == null || dto.snList.Count == 0)
+ throw new ArgumentException("杈撳叆鍙傛暟鏃犳晥");
+
+ var sqlHelper = new OracleSQLHelper();
+ bool result = true;
+ var (connection, transaction) = sqlHelper.BeginTransaction();
+
+ try
+ {
+ foreach (var sn in dto.snList)
+ {
+ if (dto.ActionType == 0) // 瑙ｇ粦
+ {
+ string sql = @"
+ UPDATE MES_SN_STATUS_DETAILS
+ SET IS_UNBIND = 1,
+ UNBIND_DATE = SYSDATE,
+ UNBIND_USER = :LoginId
+ WHERE TICKET_NO = :TicketNo
+ AND SN_NO = :SnNo
+ AND NVL(IS_UNBIND, 0) = 0";
+
+ var parameters = new[]
+ {
+ new OracleParameter(":LoginId", dto.loginId),
+ new OracleParameter(":TicketNo", sn.tickeNo),
+ new OracleParameter(":SnNo", sn.snNo)
+ };
+
+ int rows = sqlHelper.ExecuteNonQueryWithTransaction(sql, parameters, connection, transaction);
+ if (rows == 0)
+ {
+ throw new Exception($"瑙ｇ粦澶辫触: 宸ュ崟[{sn.tickeNo}], SN[{sn.snNo}] 鏈壘鍒板彲瑙ｇ粦璁板綍鎴栧凡瑙ｇ粦锛�");
+ }
+ }
+ else if (dto.ActionType == 1) // 鎾ら攢瑙ｇ粦
+ {
+ string sql = @"
+ UPDATE MES_SN_STATUS_DETAILS
+ SET IS_UNBIND = 0,
+ UNBIND_DATE = NULL,
+ UNBIND_USER = NULL
+ WHERE TICKET_NO = :TicketNo
+ AND SN_NO = :SnNo
+ AND NVL(IS_UNBIND, 0) = 1";
+
+ var parameters = new[]
+ {
+ new OracleParameter(":TicketNo", sn.tickeNo),
+ new OracleParameter(":SnNo", sn.snNo)
+ };
+
+ int rows = sqlHelper.ExecuteNonQueryWithTransaction(sql, parameters, connection, transaction);
+ if (rows == 0)
+ {
+ throw new Exception($"鎾ら攢瑙ｇ粦澶辫触: 宸ュ崟[{sn.tickeNo}], SN[{sn.snNo}] 鏈壘鍒板凡瑙ｇ粦璁板綍锛�");
+ }
+ }
+ else
+ {
+ throw new Exception("鏃犳晥鐨勬搷浣滅被鍨嬶紒鍙兘鏄� 0=瑙ｇ粦 鎴� 1=鎾ら攢瑙ｇ粦");
+ }
+ }
+
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ result = false;
+ // 寤鸿杩欓噷鍐欐棩蹇� ex.Message
+ throw;
+ }
+ finally
+ {
+ connection.Close();
+ }
+
+ 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