From 4b8adf76a495aca73c3a1af9b28a15d19b9a03f4 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 28 十一月 2025 14:38:52 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/QC/SJService.cs | 64 +-
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 1246 ++++++++++++++++++++++++++-----------------------------
StandardPda/MESApplication/Controllers/WomcaaController.cs | 1
3 files changed, 613 insertions(+), 698 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index 98f4a1a..9d487b2 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Data;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Data;
namespace MES.Service.service.QC;
@@ -35,8 +35,7 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public (List<SJPageResult> item, int TotalCount) getPage(
- SJPageResult queryObj)
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -68,7 +67,7 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.FSubmit == 1)
+ a => a.FSubmit == 1)
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -466,7 +465,7 @@
return withOracle;
}
-
+
public bool SJQaSubmit(LLJDto rkjDto)
{
var useTransactionWithOracle =
@@ -482,7 +481,6 @@
return useTransactionWithOracle > 0;
}
-
public List<Component> getYzxBDlist(string id)
{
OracleSQLHelper SQLHelper = new();
@@ -494,13 +492,11 @@
var sql1 =
string.Format(
- @"select CASE WHEN max(MULTI_SELECT) is null THEN ''ELSE '銆�'||max(MULTI_SELECT)||'銆�' END as A,ITEMNAME as ITEMNAME from MES_IQC_CONSISTENCY_SJ_ck where PID='" +
- id + "' group by ITEMNAME order by ITEMNAME");
+ @"select CASE WHEN max(MULTI_SELECT) is null THEN ''ELSE '銆�'||max(MULTI_SELECT)||'銆�' END as A,ITEMNAME as ITEMNAME from MES_IQC_CONSISTENCY_SJ_ck where PID='" + id + "' group by ITEMNAME order by ITEMNAME");
//鏌ユ槑缁�
var sql2 =
- string.Format(
- @"select * from MES_IQC_CONSISTENCY_SJ_ck where PID='" +
- id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
+ string.Format(@"select * from MES_IQC_CONSISTENCY_SJ_ck where PID='" +
+ id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
var dataTable1 = SQLHelper.ExecuteQuery(sql1);
var dataTable2 = SQLHelper.ExecuteQuery(sql2);
var Components = new List<Component>();
@@ -539,7 +535,18 @@
return Components;
}
-
+ /// <summary>
+ /// 涓�鑷存�ч」鐩�
+ /// </summary>
+ public class Component
+ {
+ public string Name { get; set; }
+ public List<string> Specs { get; set; }
+ public List<string> Manufacturers { get; set; }
+ public List<string> Id { get; set; }
+ public int SelectedSpec { get; set; }
+ public int SelectedMfg { get; set; }
+ }
public void saveYzxBDlist(string id, DataTable DB)
{
OracleSQLHelper SQLHelper = new();
@@ -562,7 +569,6 @@
id + "'and id in(" + rowId + ") ");
SQLHelper.ExecuteQuery(sql2);
}
-
public string[] YzxImgVerify(string id)
{
var msgStr = new string[2];
@@ -576,18 +582,11 @@
var sql2 = string.Format(
- @"select A.ITEMNAME from ( select 999||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid='" +
- id +
- "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where PID='" +
- id + "' and MULTI_SELECT is not null)" +
- "group by ITEMNAME) A" +
- " left join MES_QS_IMAGE b on a.id=b.fid where B.id is null" +
- " union" +
- " select '鍒嗙粍锛�' || MULTI_SELECT as ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid = '" +
- id +
- "' and MULTI_SELECT is not null and MULTI_SELECT not in(select A.MULTI_SELECT as ITEMNAME from (select 888 || min(id) id, MULTI_SELECT from MES_IQC_CONSISTENCY_SJ_CK where pid = '" +
- id +
- "' and MULTI_SELECT is not null group by MULTI_SELECT,ITEMNAME) A left join MES_QS_IMAGE b on a.id = b.fid where B.id is not null) group by MULTI_SELECT");
+ @"select A.ITEMNAME from ( select 999||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid='" + id.ToString() + "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where PID='" + id.ToString() + "' and MULTI_SELECT is not null)" +
+ "group by ITEMNAME) A" +
+ " left join MES_QS_IMAGE b on a.id=b.fid where B.id is null" +
+ " union" +
+ " select '鍒嗙粍锛�' || MULTI_SELECT as ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid = '" + id.ToString() + "' and MULTI_SELECT is not null and MULTI_SELECT not in(select A.MULTI_SELECT as ITEMNAME from (select 999 || min(id) id, MULTI_SELECT from MES_IQC_CONSISTENCY_SJ_CK where pid = '" + id.ToString() + "' and MULTI_SELECT is not null group by MULTI_SELECT,ITEMNAME) A left join MES_QS_IMAGE b on a.id = b.fid where B.id is not null) group by MULTI_SELECT");
var db = SQLHelper.ExecuteQuery(sql2);
if (db.Rows.Count > 0)
@@ -605,18 +604,5 @@
}
return msgStr;
- }
-
- /// <summary>
- /// 涓�鑷存�ч」鐩�
- /// </summary>
- public class Component
- {
- public string Name { get; set; }
- public List<string> Specs { get; set; }
- public List<string> Manufacturers { get; set; }
- public List<string> Id { get; set; }
- public int SelectedSpec { get; set; }
- public int SelectedMfg { get; set; }
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 6f7eef0..8889b8c 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -1,233 +1,247 @@
-锘縰sing System.Data;
+锘縰sing Masuit.Tools;
using MES.Service.DB;
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;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
-namespace MES.Service.service.Warehouse;
-
-public class WomdaaManager
+namespace MES.Service.service.Warehouse
{
- /// <summary>
- /// 鑾峰彇浜ф祴鐧诲綍鍙峰搴斿伐鍗曚俊鎭�
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public DataTable GetTickeInfo(string LineId, string LoginId)
+ public class WomdaaManager
{
- 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
- // 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";
- //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);
- }
-
-
- /// <summary>
- /// 璁板綍浜ф祴杩囩珯淇℃伅
- /// </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)
- //{
- // 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();
- var result = true;
-
- var (connection, transaction) = sqlHelper.BeginTransaction();
-
- try
+ /// <summary>
+ /// 鑾峰彇浜ф祴鐧诲綍鍙峰搴斿伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public DataTable GetTickeInfo(string LineId, string LoginId)
{
- // 1. 涓昏〃鎻掑叆
- // 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)";
+ 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";
- // 1. 涓昏〃鎻掑叆
- var sql1 = @"
+ //鏀逛负鎸夌珯浣嶅彿鍙嶆煡浜х嚎锛屽啀閫氳繃浜х嚎鏌ュ嚭宸ュ崟淇℃伅
+ //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";
+ //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\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);
+ }
+
+
+ /// <summary>
+ /// 璁板綍浜ф祴杩囩珯淇℃伅
+ /// </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)
+ //{
+ // 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();
+ 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,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, LINE_NO)
SELECT SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
@@ -241,30 +255,24 @@
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)
- };
-
- var i = sqlHelper.ExecuteNonQueryWithTransaction(sql1, parameters1,
- connection, transaction);
-
- // 2. 澶辫触椤规彃鍏�
- if (i > 0 && asnInfo.failItems?.Count > 0)
- foreach (var item in asnInfo.failItems)
+ var parameters1 = new[]
{
- var sql2 = @"
+ 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 = @"
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,
@@ -276,52 +284,43 @@
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)
- };
+ 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);
+ sqlHelper.ExecuteNonQueryWithTransaction(sql2, parameters2, connection, transaction);
+ }
}
- // 3. 閰嶄欢缁戝畾/瑙ｇ粦 & 鏃ュ織璁板綍
- if (asnInfo.accessoryList?.Count > 0)
- foreach (var accessory in asnInfo.accessoryList)
+ // 3. 閰嶄欢缁戝畾/瑙ｇ粦 & 鏃ュ織璁板綍
+ if (asnInfo.accessoryList?.Count > 0)
{
- var snNo = asnInfo.snNo;
- var partSn = accessory.accessorySn;
- var partName = accessory.accessoryName;
- var user = asnInfo.loginId;
-
- if (accessory.bindingState == "0") // 缁戝畾
+ foreach (var accessory in asnInfo.accessoryList)
{
- // 鏍￠獙
- var checkSql =
- "SELECT COUNT(1) FROM MES_SN_PART_BINDING WHERE PART_SN_NO = :partSn";
- var checkParams = new[]
+ var snNo = asnInfo.snNo;
+ var partSn = accessory.accessorySn;
+ var partName = accessory.accessoryName;
+ var user = asnInfo.loginId;
+
+ if (accessory.bindingState == "0") // 缁戝畾
{
- new OracleParameter("partSn",
- partSn ?? (object)DBNull.Value)
- };
- var exists = Convert.ToInt32(
- sqlHelper.ExecuteScalarWithTransaction(connection,
- transaction, checkSql, checkParams));
+ // 鏍￠獙
+ 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}]宸茬粦瀹氾紝璇峰厛瑙ｇ粦鍐嶇粦瀹氾紒");
+ if (exists > 0)
+ {
+ throw new Exception($"閰嶄欢SN[{partSn}]宸茬粦瀹氾紝璇峰厛瑙ｇ粦鍐嶇粦瀹氾紒");
+ }
- // 鎻掑叆缁戝畾
- var 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,
@@ -331,24 +330,19 @@
SYSDATE,
:createUser)";
- 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)
- };
+ 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);
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlBind, bindParams, connection, transaction);
- // 鎻掑叆鏃ュ織
- var sqlLog = @"
+ // 鎻掑叆鏃ュ織
+ 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,
@@ -359,30 +353,26 @@
:createUser,
0)";
- sqlHelper.ExecuteNonQueryWithTransaction(sqlLog,
- bindParams, connection, transaction);
- }
- else if (accessory.bindingState == "1") // 瑙ｇ粦
- {
- // 鍒犻櫎缁戝畾
- var sqlUnbind = @"
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, bindParams, connection, transaction);
+ }
+ else if (accessory.bindingState == "1") // 瑙ｇ粦
+ {
+ // 鍒犻櫎缁戝畾
+ var sqlUnbind = @"
DELETE FROM MES_SN_PART_BINDING
WHERE SN_NO = :snNo
AND PART_SN_NO = :partSn";
- var unbindParams = new[]
- {
- new OracleParameter("snNo",
- snNo ?? (object)DBNull.Value),
- new OracleParameter("partSn",
- partSn ?? (object)DBNull.Value)
- };
+ var unbindParams = new[]
+ {
+ new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
+ new OracleParameter("partSn", partSn ?? (object)DBNull.Value)
+ };
- sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind,
- unbindParams, connection, transaction);
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind, unbindParams, connection, transaction);
- // 鎻掑叆鏃ュ織
- var sqlLog = @"
+ // 鎻掑叆鏃ュ織
+ 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,
@@ -393,370 +383,305 @@
: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)
- };
+ 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);
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
+ }
}
}
- transaction.Commit();
- }
- catch (Exception)
- {
- transaction.Rollback();
- result = false;
- throw;
- }
- finally
- {
- sqlHelper.CloseConnection(connection);
- }
-
- return result;
- }
-
-
- /// <summary>
- /// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
- /// </summary>
- public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
- {
- var sqlHelper = new OracleSQLHelper();
- var msg = new string[2];
- msg[0] = "true";
-
- var (connection, transaction) = sqlHelper.BeginTransaction();
-
- try
- {
- if (mesMiddleBox.type.ToUpper() == "A") // 缁戝畾
+ transaction.Commit();
+ }
+ catch (Exception)
{
- if (mesMiddleBox.SnList.Count > 0)
+ transaction.Rollback();
+ result = false;
+ throw;
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
+ }
+
+ return result;
+ }
+
+
+
+ /// <summary>
+ /// 璁剧疆涓鐮侊紙缁戝畾/瑙ｇ粦 SN锛�
+ /// </summary>
+ 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") // 缁戝畾
{
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪
- var sqlCheck =
- "SELECT COUNT(*) FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
- var checkParams = new[]
+ if (mesMiddleBox.SnList.Count > 0)
{
- new OracleParameter(":code", mesMiddleBox.MediumBoxCode)
- };
- var count = Convert.ToInt32(
- sqlHelper.ExecuteScalarWithTransaction(connection,
- transaction, sqlCheck, checkParams));
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪
+ 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 (count > 0)
- {
- msg[0] = "false";
- msg[1] =
- $"璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛歿mesMiddleBox.MediumBoxCode}";
- transaction.Rollback();
- return msg;
- }
+ if (count > 0)
+ {
+ msg[0] = "false";
+ msg[1] = $"璇ヤ腑绠辩爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佷腑绠辩爜锛歿mesMiddleBox.MediumBoxCode}";
+ transaction.Rollback();
+ return msg;
+ }
- foreach (var item in mesMiddleBox.SnList)
- {
- // 鎻掑叆缁戝畾
- var sqlInsert = @"
+ foreach (var item in mesMiddleBox.SnList)
+ {
+ // 鎻掑叆缁戝畾
+ 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,
: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);
+ 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);
- // 鎻掑叆鏃ュ織
- var sqlLog = @"
+ // 鎻掑叆鏃ュ織
+ 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,
: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);
+ 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
+ {
+ msg[0] = "false";
+ msg[1] = "SN鏄庣粏涓虹┖锛屾棤娉曠粦瀹氾紒";
}
}
- else
+ else if (mesMiddleBox.type.ToUpper() == "F") // 瑙ｇ粦
{
- msg[0] = "false";
- msg[1] = "SN鏄庣粏涓虹┖锛屾棤娉曠粦瀹氾紒";
- }
- }
- else if (mesMiddleBox.type.ToUpper() == "F") // 瑙ｇ粦
- {
- 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);
+ 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)
- {
- var sqlLog = @"
+ foreach (DataRow row in dt.Rows)
+ {
+ 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,
: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);
- }
-
- var sqlDelete =
- "DELETE FROM MES_MIDDLE_BOX WHERE MEDIUMBOXCODE = :code";
- var delParams = new[]
- {
- new OracleParameter(":code", mesMiddleBox.MediumBoxCode)
+ 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(sqlDelete, delParams,
- connection, transaction);
- }
- 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>
- public string[] SetStackCode(MesPalletBinding mesPalletBinding)
- {
- var sqlHelper = new OracleSQLHelper();
- var msg = new string[2];
- msg[0] = "true";
-
- var (connection, transaction) = sqlHelper.BeginTransaction();
-
- try
- {
- if (mesPalletBinding.Type.ToUpper() == "A") // 缁戝畾
- {
- if (mesPalletBinding.SnList.Count > 0)
- {
- 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 (count > 0)
- {
- msg[0] = "false";
- msg[1] =
- $"璇ユ爤鏉跨爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佹爤鏉跨爜锛歿mesPalletBinding.StackCode}";
- transaction.Rollback();
- return msg;
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
}
- foreach (var item in mesPalletBinding.SnList)
+ 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
+ {
+ 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>
+ 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)
{
- var sqlInsert = @"
+ 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 (count > 0)
+ {
+ msg[0] = "false";
+ msg[1] = $"璇ユ爤鏉跨爜宸茬粡缁戝畾SN鏁版嵁锛屽闇�鍐嶆缁戝畾璇峰厛瑙ｇ粦锛佹爤鏉跨爜锛歿mesPalletBinding.StackCode}";
+ transaction.Rollback();
+ return msg;
+ }
+
+ foreach (var item in mesPalletBinding.SnList)
+ {
+ 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,
: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);
+ 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);
- var sqlLog = @"
+ 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,
:stackCode, :loginId, :snNo, :ticketNo, :mediumBoxCode, SYSDATE, :createdBy, 0)";
- sqlHelper.ExecuteNonQueryWithTransaction(sqlLog,
- insertParams, connection, transaction);
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, insertParams, connection, transaction);
+ }
+ }
+ else
+ {
+ msg[0] = "false";
+ msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
}
}
- else
+ else if (mesPalletBinding.Type.ToUpper() == "F") // 瑙ｇ粦
{
- msg[0] = "false";
- msg[1] = "SN鏄庣粏涓虹┖锛岃纭锛�";
- }
- }
- else if (mesPalletBinding.Type.ToUpper() == "F") // 瑙ｇ粦
- {
- 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));
+ 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;
- }
+ 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);
+ 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)
- {
- var sqlLog = @"
+ foreach (DataRow row in dt.Rows)
+ {
+ 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,
: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);
+ 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);
+ }
+
+ var sqlDelete = "DELETE FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode";
+ var delParams = new[] { new OracleParameter(":stackCode", mesPalletBinding.StackCode) };
+ sqlHelper.ExecuteNonQueryWithTransaction(sqlDelete, delParams, connection, transaction);
}
- 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)
+ {
+ transaction.Rollback();
+ msg[0] = "false";
+ msg[1] = ex.Message;
+ throw;
+ }
+ finally
+ {
+ sqlHelper.CloseConnection(connection);
}
- transaction.Commit();
- }
- catch (Exception ex)
- {
- transaction.Rollback();
- msg[0] = "false";
- msg[1] = ex.Message;
- throw;
- }
- finally
- {
- sqlHelper.CloseConnection(connection);
+ return msg;
}
- return msg;
- }
-
- /// <summary>
- /// 澶勭悊瑙ｇ粦 / 鎾ら攢瑙ｇ粦
- /// </summary>
- public bool ProcessSn(UnbindAsnInfoDto dto)
- {
- if (dto == null || dto.snList == null || dto.snList.Count == 0)
- throw new ArgumentException("杈撳叆鍙傛暟鏃犳晥");
-
- var sqlHelper = new OracleSQLHelper();
- var result = true;
- var (connection, transaction) = sqlHelper.BeginTransaction();
-
- try
+ /// <summary>
+ /// 澶勭悊瑙ｇ粦 / 鎾ら攢瑙ｇ粦
+ /// </summary>
+ public bool ProcessSn(UnbindAsnInfoDto dto)
{
- foreach (var sn in dto.snList)
- if (dto.ActionType == 0) // 瑙ｇ粦
+ 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)
{
- var sql = @"
+ if (dto.ActionType == 0) // 瑙ｇ粦
+ {
+ string sql = @"
UPDATE MES_SN_STATUS_DETAILS
SET IS_UNBIND = 1,
UNBIND_DATE = SYSDATE,
@@ -765,22 +690,22 @@
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)
- };
+ var parameters = new[]
+ {
+ new OracleParameter(":LoginId", dto.loginId),
+ new OracleParameter(":TicketNo", sn.tickeNo),
+ new OracleParameter(":SnNo", sn.snNo)
+ };
- var rows = sqlHelper.ExecuteNonQueryWithTransaction(sql,
- parameters, connection, transaction);
- if (rows == 0)
- throw new Exception(
- $"瑙ｇ粦澶辫触: 宸ュ崟[{sn.tickeNo}], SN[{sn.snNo}] 鏈壘鍒板彲瑙ｇ粦璁板綍鎴栧凡瑙ｇ粦锛�");
- }
- else if (dto.ActionType == 1) // 鎾ら攢瑙ｇ粦
- {
- var sql = @"
+ 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,
@@ -789,37 +714,40 @@
AND SN_NO = :SnNo
AND NVL(IS_UNBIND, 0) = 1";
- var parameters = new[]
+ 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
{
- new OracleParameter(":TicketNo", sn.tickeNo),
- new OracleParameter(":SnNo", sn.snNo)
- };
-
- var rows = sqlHelper.ExecuteNonQueryWithTransaction(sql,
- parameters, connection, transaction);
- if (rows == 0)
- throw new Exception(
- $"鎾ら攢瑙ｇ粦澶辫触: 宸ュ崟[{sn.tickeNo}], SN[{sn.snNo}] 鏈壘鍒板凡瑙ｇ粦璁板綍锛�");
- }
- else
- {
- throw new Exception("鏃犳晥鐨勬搷浣滅被鍨嬶紒鍙兘鏄� 0=瑙ｇ粦 鎴� 1=鎾ら攢瑙ｇ粦");
+ throw new Exception("鏃犳晥鐨勬搷浣滅被鍨嬶紒鍙兘鏄� 0=瑙ｇ粦 鎴� 1=鎾ら攢瑙ｇ粦");
+ }
}
- transaction.Commit();
- }
- catch (Exception ex)
- {
- transaction.Rollback();
- result = false;
- // 寤鸿杩欓噷鍐欐棩蹇� ex.Message
- throw;
- }
- finally
- {
- connection.Close();
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ transaction.Rollback();
+ result = false;
+ // 寤鸿杩欓噷鍐欐棩蹇� ex.Message
+ throw;
+ }
+ finally
+ {
+ connection.Close();
+ }
+
+ return result;
}
- return result;
}
-}
\ No newline at end of file
+}
diff --git a/StandardPda/MESApplication/Controllers/WomcaaController.cs b/StandardPda/MESApplication/Controllers/WomcaaController.cs
index 6ff858f..02b12ee 100644
--- a/StandardPda/MESApplication/Controllers/WomcaaController.cs
+++ b/StandardPda/MESApplication/Controllers/WomcaaController.cs
@@ -29,6 +29,7 @@
entity.TableName = TableName;
entity.Url = URL + "Save";
entity.Method = METHOD;
+ entity.PageName = rohIn.ErpCaa.FBillNo;
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
--
Gitblit v1.9.3