From 012075cfe51f93d2a3e80a5ed0891b55b664add9 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期一, 09 六月 2025 23:28:48 +0800
Subject: [PATCH] 检验项目新增特殊物料备注
---
StandardInterface/MES.Service/service/QC/LljService.cs | 11 +++++++++--
StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs | 5 +++++
StandardInterface/MES.Service/Dto/service/LLJDto.cs | 2 ++
StandardInterface/MESApplication/appsettings.json | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/service/LLJDto.cs b/StandardInterface/MES.Service/Dto/service/LLJDto.cs
index 6ee2a7b..7e88165 100644
--- a/StandardInterface/MES.Service/Dto/service/LLJDto.cs
+++ b/StandardInterface/MES.Service/Dto/service/LLJDto.cs
@@ -20,6 +20,8 @@
//澶囨敞
public string? Remarks { get; set; }
+ //鐗规畩澶囨敞
+ public string? Meom { get; set; }
//==========================================
//宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁
diff --git a/StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index 715881a..6f00396 100644
--- a/StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/StandardInterface/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -173,4 +173,9 @@
public DateTime? LastupdateDate { get; set; }
[SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "MEOM")]
+ public string? Meom { 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 733986e..d587116 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -280,7 +280,8 @@
a.CheckQyt,
a.FcheckResu,
a.FcheckItemDesc,
- a.Funit
+ a.Funit,
+ a.Meom
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -302,7 +303,8 @@
FcheckResu = a.FcheckResu,
// FcheckItemDesc = a.FcheckItemDesc
FcheckItemDesc = a.FspecRequ,
- Funit = a.Funit
+ Funit = a.Funit,
+ Meom = a.Meom,
}).ToList();
}
@@ -579,6 +581,11 @@
it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
+ return db.Updateable<MesQaItemsDetectDetail5>()
+ .SetColumns(it =>
+ it.Meom == dto.Meom)
+ .Where(it => it.Id == dto.pid)
+ .ExecuteCommand();
});
}
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