From 9f22ad7462ceb1b62fe1752be69d5b3a323a5ff8 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期六, 30 八月 2025 09:52:05 +0800
Subject: [PATCH] 代码提交，校验栈板码已经在MES入库，不允许解绑
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 7b4fa5f..2b20140 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();
//鏌ュ伐鍗曚俊鎭�
@@ -39,12 +40,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);
}
@@ -91,13 +94,13 @@
// 1. 涓昏〃鎻掑叆
var sql1 = $@"
INSERT INTO MES_SN_STATUS_DETAILS
- (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
+ (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.loginId}','{asnInfo.turnoverCode}')";
int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);
// 2. 澶辫触椤规彃鍏�
@@ -414,9 +417,21 @@
// 瑙ｇ粦
else if (mesPalletBinding.Type.ToUpper() == "F")
{
+ // 瑙ｇ粦鍓嶏紝妫�鏌ヨ鏍堟澘鐮佹槸鍚﹀凡缁忓湪MES鍏ュ簱
+ string sql1 = $"SELECT COUNT(*) COUNT FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}' and IS_INBOUND=1";
+ DataTable data = sqlHelper.ExecuteQuery(sql1);
+
+ if (data.Rows[0]["COUNT"].ToString() != "0")
+ {
+ msg[0] = "false";
+ msg[1] = "璇ユ爤鏉跨爜宸茬粡鍦∕ES鍏ュ簱锛屼笉鍏佽瑙ｇ粦锛佹爤鏉跨爜锛�" + mesPalletBinding.StackCode;
+ transaction.Rollback();
+ return msg;
+ }
+
// 鍏堟煡璇㈢粦瀹氱殑璁板綍
string sqlSelect = $"SELECT * FROM MES_PALLET_BINDING WHERE STACKCODE = '{mesPalletBinding.StackCode}'";
- DataTable dt = sqlHelper.ExecuteQuery( sqlSelect);
+ DataTable dt = sqlHelper.ExecuteQuery(sqlSelect);
foreach (DataRow row in dt.Rows)
{
@@ -463,5 +478,91 @@
}
+ /// <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;
+ }
+
}
}
--
Gitblit v1.9.3