From 6ebb0da7953f6f642287379ceea82b0d30950371 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 05 八月 2025 19:40:10 +0800
Subject: [PATCH] 产测接口，实体字段调整
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 275 insertions(+), 12 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 5a11494..b0d1277 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
{
@@ -22,12 +23,28 @@
{
OracleSQLHelper SQLHelper = new();
//鏌ュ伐鍗曚俊鎭�
- var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
- 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";
+ //var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
+ // 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";
+ //鏀逛负鎸夌珯浣嶅彿鍙嶆煡浜х嚎锛屽啀閫氳繃浜х嚎鏌ュ嚭宸ュ崟淇℃伅
+ //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);
}
@@ -37,19 +54,265 @@
/// </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>
+ /// 璁剧疆涓鐮�
+ /// </summary>
+ /// <param name="mesMiddleBox"></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)
+ {
+ 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}' -- 鍒涘缓浜�
+ )
+ ";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ }
+ }
+ else
+ {
+ msg[0] = "false";
+ }
+ } else if(mesMiddleBox.type.ToUpper() == "F") {
+ //瑙ｇ粦锛屾牴鎹腑绠辩爜鍏ㄩ儴鍒犻櫎
+ var sql2 = $@"delete MES_MIDDLE_BOX where MEDIUMBOXCODE='{mesMiddleBox.MediumBoxCode}'";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ }
+ else
+ {
+ msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
+ msg[0] = "false";
+ }
+
+
+ // 鍏ㄩ儴鎴愬姛鎻愪氦
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ msg[0] = "false";
+ msg[1] = ex.Message;
+ throw; // 寤鸿璁板綍鏃ュ織
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
+ }
+
+ return msg;
+ }
+
+
+ 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)
+ {
+ 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}' -- 鍒涘缓浜�
+ )
+
+ ";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ }
+ }
+ else
+ {
+ msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
+ msg[0] = "false";
+ }
+ }
+ //瑙ｇ粦
+ else if(mesPalletBinding.Type.ToUpper() == "F")
+ {
+ //瑙ｇ粦锛屾牴鎹腑绠辩爜鍏ㄩ儴鍒犻櫎
+ var sql2 = $@"delete MES_PALLET_BINDING where STACKCODE='" + mesPalletBinding.StackCode + "'";
+
+ sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
+ }
+
+
+ // 鍏ㄩ儴鎴愬姛鎻愪氦
+ 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