From aa9e526bdcab9e817dbc2b112126aa0328e91a2b Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 21 三月 2025 17:34:39 +0800
Subject: [PATCH] 1.删除特征值.2.image_delete3.entity
---
entity/MesQaItemsDetectDetail5.cs | 15 +++
entity/LLJView.cs | 6 +
entity/MesQaItemsDetectDetail13.cs | 58 ++++++++++++++
Dto/service/LLJDto.cs | 2
Controllers/QC/LljController.cs | 67 ++++++++++++++++
service/QC/LljService.cs | 39 ++++++++-
6 files changed, 181 insertions(+), 6 deletions(-)
diff --git a/Controllers/QC/LljController.cs b/Controllers/QC/LljController.cs
index 67510f1..33746e9 100644
--- a/Controllers/QC/LljController.cs
+++ b/Controllers/QC/LljController.cs
@@ -295,4 +295,71 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
+ //鍒犻櫎鐗瑰緛鍊�
+ [HttpPost("deleteDetail13")]
+ public ResponseResult deleteDetail13(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().deleteDetail13(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //鏇存柊涓嶅悎鏍兼弿杩�
+ [HttpPost("updateRemarks")]
+ public ResponseResult updateRemarks(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().updateRemarks(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //鏇存柊涓嶅悎鏍兼弿杩�
+ [HttpPost("getImage")]
+ public ResponseResult getImage(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().updateRemarks(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
diff --git a/Dto/service/LLJDto.cs b/Dto/service/LLJDto.cs
index 10a2f7c..384969d 100644
--- a/Dto/service/LLJDto.cs
+++ b/Dto/service/LLJDto.cs
@@ -17,6 +17,8 @@
//瀛欒〃id
public string? id { get; set; }
+ //瀛欒〃id2锛堟牱鏈�糹d锛�
+ public string? id13 { get; set; }
//澶囨敞
public string? Remarks { get; set; }
diff --git a/entity/LLJView.cs b/entity/LLJView.cs
index 7b5d86c..eb7e7ad 100644
--- a/entity/LLJView.cs
+++ b/entity/LLJView.cs
@@ -152,4 +152,10 @@
/// </summary>
[SugarColumn(ColumnName = "F_TYPE")]
public bool? Ftype { get; set; }
+
+ /// <summary>
+ /// 濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級
+ /// </summary>
+ [SugarColumn(ColumnName = "remarks")]
+ public string? Remarks { get; set; }
}
\ No newline at end of file
diff --git a/entity/MesQaItemsDetectDetail13.cs b/entity/MesQaItemsDetectDetail13.cs
new file mode 100644
index 0000000..7391008
--- /dev/null
+++ b/entity/MesQaItemsDetectDetail13.cs
@@ -0,0 +1,58 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Models;
+
+/// <summary>
+/// IQC妫�楠屾牱渚嬭〃
+/// </summary>
+[SugarTable("MES_QA_ITEMS_DETECT_DETAIL13")]
+public class MesQaItemsDetectDetail13
+{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid? Guid { get; set; }
+
+ /// <summary>
+ /// 鐖朵翰Guid
+ /// </summary>
+ [SugarColumn(ColumnName = "parent_guid")]
+ public Guid? ParentGuid { get; set; }
+
+ /// <summary>
+ /// 鐖风埛Guid
+ /// </summary>
+ [SugarColumn(ColumnName = "grandpa_guid")]
+ public Guid? GrandpaGuid { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋滃��
+ /// </summary>
+ [SugarColumn(ColumnName = "fcheck_resu")]
+ public decimal? FCheckResu { get; set; }
+
+ /// <summary>
+ /// 鍒ゅ畾鏍囧織
+ /// </summary>
+ [SugarColumn(ColumnName = "fstand")]
+ public string? FStand { get; set; }
+
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ /// </summary>
+ [SugarColumn(ColumnName = "fcheck_item")]
+ public string? FCheckItem { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡锛堟楠屾椂闂达級
+ /// </summary>
+ [SugarColumn(ColumnName = "create_date")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜猴紙妫�楠屼汉锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "create_by")]
+ public string? CreateBy { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesQaItemsDetectDetail5.cs b/entity/MesQaItemsDetectDetail5.cs
index 019704f..e70cef6 100644
--- a/entity/MesQaItemsDetectDetail5.cs
+++ b/entity/MesQaItemsDetectDetail5.cs
@@ -27,7 +27,7 @@
/// 鏍囧噯鍊�
/// </summary>
[SugarColumn(ColumnName = "fstand")]
- public int? Fstand { get; set; }
+ public string? Fstand { get; set; }
/// <summary>
/// 涓婂叕宸�
@@ -183,5 +183,18 @@
[SugarColumn(ColumnName = "remarks")]
public string? Remarks { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ [SugarColumn(ColumnName = "forder")]
+ public int? Order { get; set; }
+
+ /// <summary>
+ /// 鏍锋湰鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "ybsl")]
+ public int? Ybsl { get; set; }
+
[SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
}
\ No newline at end of file
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 81d2ed3..4d08f59 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -1,9 +1,11 @@
-锘縰sing Microsoft.IdentityModel.Tokens;
+锘縰sing MES.Service.Models;
+using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using SqlSugar;
+using static Azure.Core.HttpHeader;
namespace NewPdaSqlServer.service.QC;
@@ -69,7 +71,7 @@
FcheckItem = b.FcheckItem,
FdownAllow = b.FdownAllow,
FcheckLevel = b.FREQUENCY,
- Fstand = Convert.ToInt32(b.FSTAND),
+ Fstand = b.FSTAND,
FupAllow = b.FupAllow,
SampleSizeNo = b.SampleSizeNo,
FenterQty = 0,
@@ -229,7 +231,9 @@
a.FspecRequ,
a.FreQty,
a.CheckQyt,
- a.FcheckResu
+ a.FcheckResu,
+ a.Order,
+ a.Ybsl
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Guid = a.Guid,
@@ -249,8 +253,11 @@
Factory = "1000",
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Guid),
- FcheckResu = a.FcheckResu
- }).ToList();
+ FcheckResu = a.FcheckResu,
+ Order = a.Order,
+ Ybsl = a.Ybsl,
+ }).OrderBy(a => a.Order)
+ .ToList();
}
public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
@@ -717,4 +724,26 @@
return [isNullCount, isNotNullCount];
}
+
+
+
+ //鍒犻櫎鐗瑰緛鍊�
+ public int deleteDetail13(LLJDto dto)
+ {
+ var withOracle = Db.Deleteable<MesQaItemsDetectDetail13>()
+ .Where(s => s.Guid.ToString() == dto.id13)
+ .ExecuteCommand();
+
+ return withOracle;
+ }
+
+ //鍒犻櫎鐗瑰緛鍊�
+ public List<MesFile> updateRemarks(LLJDto dto)
+ {
+ var withOracle = Db.Queryable<MesFile>()
+ .Where(s => s.ParentGuid.ToString() == dto.gid)
+ .ToList();
+
+ return withOracle;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3