From 940b1a470e6a9614adbf992eed05e47c52521486 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 04 七月 2025 16:16:28 +0800
Subject: [PATCH] 首检巡检
---
StandardInterface/MES.Service/Modes/QsItemIpiReq.cs | 8 ++++++++
StandardInterface/MES.Service/service/QC/LljService.cs | 4 ++--
StandardInterface/MES.Service/service/QC/XJService.cs | 3 ++-
StandardInterface/MES.Service/Dto/service/SJPageResult.cs | 9 +++++++++
StandardInterface/MES.Service/Modes/MesQa.cs | 6 ++++++
StandardInterface/MES.Service/Modes/MesQualityStandard.cs | 7 +++++++
StandardInterface/MES.Service/Modes/QsItemIpiItem.cs | 7 +++++++
StandardInterface/MES.Service/service/QC/SJService.cs | 3 ++-
StandardInterface/MESApplication/appsettings.json | 2 +-
9 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/service/SJPageResult.cs b/StandardInterface/MES.Service/Dto/service/SJPageResult.cs
index 0064430..5aa2d22 100644
--- a/StandardInterface/MES.Service/Dto/service/SJPageResult.cs
+++ b/StandardInterface/MES.Service/Dto/service/SJPageResult.cs
@@ -82,4 +82,13 @@
/// </summary>
[SugarColumn(ColumnName = "DAA008")]
public decimal? Daa008 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
+
+ [SugarColumn(ColumnName = "SJ_MJ")]
+ public string? SJ_MJ { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesQa.cs b/StandardInterface/MES.Service/Modes/MesQa.cs
index 198761e..667b177 100644
--- a/StandardInterface/MES.Service/Modes/MesQa.cs
+++ b/StandardInterface/MES.Service/Modes/MesQa.cs
@@ -18,6 +18,12 @@
[SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
[StringLength(20, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�20")]
public string? CreateBy { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [Column("ITEM_ID")]
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
diff --git a/StandardInterface/MES.Service/Modes/MesQualityStandard.cs b/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
index bf414fa..69f97f2 100644
--- a/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
+++ b/StandardInterface/MES.Service/Modes/MesQualityStandard.cs
@@ -20,6 +20,13 @@
public decimal Id { get; set; }
/// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [Column("ITEM_ID")]
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
+
+ /// <summary>
/// 鍒涘缓浜�
/// </summary>
[Column("CREATE_BY")]
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
index 59642a8..b8c95f5 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
@@ -113,6 +113,13 @@
public string? QsName { get; set; }
/// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [Column("ITEM_ID")]
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
+
+ /// <summary>
/// 鏍囧噯鍊�
/// </summary>
[Column("STANDARD_VALUE")]
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs b/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
index 0daac60..4e21245 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
@@ -147,4 +147,12 @@
[SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
[StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
public string? Remarks { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀被鍨�
+ /// </summary>
+ [Column("SJ_MJ")]
+ [SugarColumn(ColumnName = "SJ_MJ")]
+ [StringLength(10, ErrorMessage = "妫�楠岀被鍨嬮暱搴︿笉鑳借秴鍑�10")]
+ public string? SJ_MJ { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index b7a7f6f..29de55e 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -66,8 +66,8 @@
|| a.ItemModel.ToLower()
.Contains(queryObj.SearchValue.ToLower()))
// .OrderByDescending((a, b,
- .OrderBy ((a, b,
- e, f, g, i) => a.Id)
+
+ .OrderBy ((a, b,e, f, g, i) => a.Id)
//.Select((a, b,
// e, f, g, i) => new LtsLlj
// {
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index db188ef..ed68577 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -92,7 +92,7 @@
// result = "鏈娴�"
// }).ToList();
// }
- public List<QsItemIpiItem> SetQSItems(string itemNo)
+ public List<QsItemIpiItem> SetQSItems(string? itemNo)
{
var db = SqlSugarHelper.GetInstance();
@@ -108,6 +108,7 @@
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
+
InspectionMethod = b.InspectionMethod,
UsingInstruments = b.UsingInstruments,
LevelNum = SqlFunc.IsNull(
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index 9ed2beb..9e9aa40 100644
--- a/StandardInterface/MES.Service/service/QC/XJService.cs
+++ b/StandardInterface/MES.Service/service/QC/XJService.cs
@@ -13,7 +13,7 @@
private readonly BaseService _baseService = new();
- private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
+ private readonly string[] statusArray = ["宸插紑宸�", "鏈紑宸�", "寰呭紑宸�"];
//鐢熸垚鏈�鏂扮殑妫�楠屽崟鍙�
public string getMaxReleaseNo()
@@ -528,4 +528,5 @@
.ExecuteCommand();
});
}
+
}
\ No newline at end of file
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