From e13e42fbe75703d21df977e8bdbda655900c9315 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期二, 14 十月 2025 17:40:18 +0800
Subject: [PATCH] RKJ,XJ修改
---
StandardInterface/MES.Service/Modes/QsItemOqcItem.cs | 6 +++---
StandardInterface/MES.Service/service/QC/RKJService.cs | 14 +++++++-------
StandardInterface/MES.Service/Modes/QsQaItemXj01.cs | 2 +-
StandardInterface/MES.Service/Modes/MesQualityStandard.cs | 2 +-
StandardInterface/MES.Service/Modes/QsQaItemXj02.cs | 2 +-
StandardInterface/MESApplication/appsettings.json | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/MesQualityStandard.cs b/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
index 69f97f2..fb4e972 100644
--- a/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
+++ b/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
@@ -91,7 +91,7 @@
/// </summary>
[Column("INSPECTION_METHOD")]
[SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
+ [StringLength(500, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�500")]
public string InspectionMethod { get; set; }
/// <summary>
diff --git a/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs b/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
index 77043a7..5335a54 100644
--- a/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
@@ -42,7 +42,7 @@
/// </summary>
[Column("INSPECTION_METHOD")]
[SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
+ [StringLength(500, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�500")]
public string? InspectionMethod { get; set; }
/// <summary>
@@ -101,7 +101,7 @@
/// </summary>
[Column("PROJ_NAME")]
[SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
+ [StringLength(500, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
public string? ProjName { get; set; }
/// <summary>
@@ -132,7 +132,7 @@
/// </summary>
[Column("USING_INSTRUMENTS")]
[SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
+ [StringLength(500, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
public string? UsingInstruments { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs b/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
index 8f18b91..ca55436 100644
--- a/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
+++ b/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
@@ -40,7 +40,7 @@
/// </summary>
[Column("INSPECTION_METHOD")]
[SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
+ [StringLength(500, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�500")]
public string? InspectionMethod { get; set; }
/// <summary>
diff --git a/StandardInterface/MES.Service/Modes/QsQaItemXj02.cs b/StandardInterface/MES.Service/Modes/QsQaItemXj02.cs
index 02d930c..179de97 100644
--- a/StandardInterface/MES.Service/Modes/QsQaItemXj02.cs
+++ b/StandardInterface/MES.Service/Modes/QsQaItemXj02.cs
@@ -38,7 +38,7 @@
/// </summary>
[Column("FSTAND")]
[SugarColumn(ColumnName = "FSTAND")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Fstand闀垮害涓嶈兘瓒呭嚭50")]
+ [StringLength(100, ErrorMessage = "Fstand闀垮害涓嶈兘瓒呭嚭50")]
public string? Fstand { get; set; }
/// <summary>
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index dc5c9a7..f7da3e0 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -559,12 +559,12 @@
var qsItemOqcReq =
db.Queryable<QsItemOqcReq>().Single(s => s.Id == gid);
- var mesInvItemIns = db.Queryable<MesInvItemIns>()
- .Single(s => s.BillNo == qsItemOqcReq.BillNo);
+ //var mesInvItemIns = db.Queryable<MesInvItemIns>()
+ // .Single(s => s.BillNo == qsItemOqcReq.BillNo);
var mesSchemeResult = db.Queryable<Womdaa>()
- .Single(s => s.Daa001 == mesInvItemIns.CbillNo);
-
+ //.Single(s => s.Daa001 == mesInvItemIns.CbillNo);
+ .Single(s => s.Daa001 == qsItemOqcReq.BillNo);
var entity = new MesQaItemsDetect02();
// entity.ItemNo = mesSchemeResult.BoardItem;
// entity.BoardItem = mesSchemeResult.BoardItem;
@@ -591,9 +591,9 @@
entity.CreateBy = createBy;
entity.FcheckBy = createBy;
- return SqlSugarHelper.UseTransactionWithOracle(db => db
- .Insertable(entity)
- .ExecuteCommand());
+ // 璺宠繃MES_QA_ITEMS_DETECT_02琛ㄧ殑鎻掑叆鎿嶄綔
+ // 涓嶅啀鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥璁板綍
+ return 0;
}
diff --git a/StandardInterface/MESApplication/appsettings.json b/StandardInterface/MESApplication/appsettings.json
index 59a3601..28cfc2a 100644
--- a/StandardInterface/MESApplication/appsettings.json
+++ b/StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
}
}
--
Gitblit v1.9.3