From 57ff0c03bd101e20742c2ba1e745a7c55deb091b Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期二, 16 九月 2025 10:28:38 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/Modes/HoleNumberInfo.cs | 32 +++++
StandardInterface/MES.Service/Modes/QsItemIpiReq.cs | 15 ++
StandardInterface/MES.Service/service/QC/LljService.cs | 58 +++++++++
StandardInterface/MES.Service/Modes/QsItemIpiItemDetail.cs | 2
StandardInterface/MES.Service/Modes/QsItemIpiItem.cs | 25 ++++
StandardInterface/MES.Service/service/QC/SJService.cs | 115 ++++++++++++++++++
StandardInterface/MESApplication/Controllers/QC/LljController.cs | 64 ++++++++++
7 files changed, 308 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/HoleNumberInfo.cs b/StandardInterface/MES.Service/Modes/HoleNumberInfo.cs
new file mode 100644
index 0000000..a681908
--- /dev/null
+++ b/StandardInterface/MES.Service/Modes/HoleNumberInfo.cs
@@ -0,0 +1,32 @@
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 绌村彿淇℃伅
+/// </summary>
+public class HoleNumberInfo
+{
+ /// <summary>
+ /// 缂栧彿锛�1,2,3...锛�
+ /// </summary>
+ public int Index { get; set; }
+
+ /// <summary>
+ /// 绌村彿锛�1-8寰幆锛�
+ /// </summary>
+ public int HoleNumber { get; set; }
+
+ /// <summary>
+ /// 鏄惁琚牭浣�
+ /// </summary>
+ public bool IsBlocked { get; set; }
+
+ /// <summary>
+ /// 璁板綍鍊�
+ /// </summary>
+ public string? RecordValue { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ public string? CheckResult { get; set; }
+}
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
index b8c95f5..14193e6 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
@@ -118,6 +118,18 @@
[Column("ITEM_ID")]
[SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { get; set; }
+ /// <summary>
+ /// 绌存暟
+ /// </summary>
+ [Column("MNUM")]
+ [SugarColumn(ColumnName = "MNUM")]
+ public decimal? Mnum { get; set; }
+ /// <summary>
+ /// 鍫电┐鍙�
+ /// </summary>
+ [Column("DNUM")]
+ [SugarColumn(ColumnName = "DNUM")]
+ public string? Dnum { get; set; }
/// <summary>
/// 鏍囧噯鍊�
@@ -168,6 +180,19 @@
[StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
public string? Remarks { get; set; }
+ /// <summary>
+ /// 閫佹鎵规暟
+ /// </summary>
+ [Column("SNUM")]
+ [SugarColumn(ColumnName = "SNUM")]
+ public decimal? Snum { get; set; }
+
+ /// <summary>
+ /// 绌村彿淇℃伅锛堢敤浜庡墠绔樉绀猴級
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public List<HoleNumberInfo>? HoleNumbers { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? result { get; set; }
[SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiItemDetail.cs b/StandardInterface/MES.Service/Modes/QsItemIpiItemDetail.cs
index 0d1c504..63bff91 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiItemDetail.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiItemDetail.cs
@@ -88,4 +88,6 @@
[SugarColumn(IsIgnore = true)] public decimal? IsPass { get; set; }
[SugarColumn(IsIgnore = true)] public int? count { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public int? startIndex { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs b/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
index 4e21245..86b6d58 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiReq.cs
@@ -155,4 +155,19 @@
[SugarColumn(ColumnName = "SJ_MJ")]
[StringLength(10, ErrorMessage = "妫�楠岀被鍨嬮暱搴︿笉鑳借秴鍑�10")]
public string? SJ_MJ { get; set; }
+
+ /// <summary>
+ /// 绌存暟
+ /// </summary>
+ [Column("MNUM")]
+ [SugarColumn(ColumnName = "MNUM")]
+ public decimal? Mnum { get; set; }
+
+ /// <summary>
+ /// 鍫电┐鍙�
+ /// </summary>
+ [Column("DNUM")]
+ [SugarColumn(ColumnName = "DNUM")]
+ [StringLength(100, ErrorMessage = "鍫电┐鍙烽暱搴︿笉鑳借秴鍑�100")]
+ public string? Dnum { 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 e907f30..c84c883 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1095,4 +1095,62 @@
throw new Exception(ex.Message);
}
}
+ public List<MesItems> GetWomdab(string daa001)
+ {
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
+
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<Womdab>()
+ .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+ .Where((w, m) => w.Dab001 == daa001)
+ .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+ // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+ .Select((w, m) => new MesItems
+ {
+ ItemNo = m.ItemNo,
+ ItemName = m.ItemName,
+ ItemModel = m.ItemModel
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+ }
+
+ }
+
+ public List<MesItems> GetWomdabById(string daa001,string ItemNo)
+ {
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
+
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<Womdab>()
+ .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+ .Where((w, m) => w.Dab001 == daa001 && m.ItemNo.Contains(ItemNo))
+ .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+ // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+ .Select((w, m) => new MesItems
+ {
+ ItemNo = m.ItemNo,
+ ItemName = m.ItemName,
+ ItemModel = m.ItemModel
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index dcc7beb..e53d43e 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -178,10 +178,38 @@
public List<QsItemIpiItem> getQSItems(decimal? pid, decimal? id)
{
var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤JOIN鏌ヨ鑾峰彇瀛愯〃鏁版嵁鍜屼富琛ㄧ殑MNUM銆丏NUM瀛楁
var qsItemIpiItems = db
- .Queryable<QsItemIpiItem>()
- .WhereIF(pid > 0, a => a.Pid == pid)
- .WhereIF(id > 0, a => a.Id == id).ToList();
+ .Queryable<QsItemIpiItem, QsItemIpiReq>((a, b) => new JoinQueryInfos(JoinType.Left, a.Pid == b.Id))
+ .WhereIF(pid > 0, (a, b) => a.Pid == pid)
+ .WhereIF(id > 0, (a, b) => a.Id == id)
+ .Select((a, b) => new QsItemIpiItem
+ {
+ Id = a.Id,
+ Pid = a.Pid,
+ ProjName = a.ProjName,
+ ItemMod = a.ItemMod,
+ InspectionMethod = a.InspectionMethod,
+ UsingInstruments = a.UsingInstruments,
+ LevelNum = a.LevelNum,
+ MaxValue = a.MaxValue,
+ StandardValue = a.StandardValue,
+ MinValue = a.MinValue,
+ Notes = a.Notes,
+ FcheckLevel = a.FcheckLevel,
+ FacLevel = a.FacLevel,
+ QsCode = a.QsCode,
+ QsName = a.QsName,
+ Picture = a.Picture,
+ Picturename = a.Picturename,
+ IsPass = a.IsPass,
+ ItemId = a.ItemId,
+ Mnum = b.Mnum, // 浠庝富琛ㄨ幏鍙朚NUM
+ Dnum = b.Dnum, // 浠庝富琛ㄨ幏鍙朌NUM
+ Snum = a.Snum, // 閫佹鎵规暟
+ Remarks = a.Remarks
+ }).ToList();
var array = qsItemIpiItems.Select(s => s.Id).ToArray();
var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
@@ -227,6 +255,16 @@
//鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
+
+ // 涓烘瘡涓楠岄」鐩敓鎴愮┐鍙蜂俊鎭�
+ qsItemIpiItems.ForEach(item =>
+ {
+ if (item.Mnum > 0 && item.Snum > 0)
+ {
+ // 浣跨敤SNUM浣滀负閫佹鎵规暟鏉ヨ绠楁�荤紪鍙锋暟閲�
+ item.HoleNumbers = GenerateHoleNumbers(item.Mnum, item.Dnum, item.Snum);
+ }
+ });
return qsItemIpiItems;
}
@@ -313,6 +351,10 @@
var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
{
List<QsItemIpiItemDetail> result = new();
+
+ // 鑾峰彇璧峰绱㈠紩锛屽鏋滄病鏈夋寚瀹氬垯浠�0寮�濮�
+ int startIndex = detail.startIndex ?? 0;
+
for (var i = 0; i < detail.count; i++)
{
var item = new QsItemIpiItemDetail();
@@ -322,6 +364,9 @@
item.FcheckResu = detail.FcheckResu;
item.CreateBy = detail.UpdateBy;
item.CreateDate = DateTime.Now;
+
+ // 濡傛灉鏈夎捣濮嬬储寮曪紝鍙互鍦ㄨ繖閲岃缃浉鍏崇殑绱㈠紩淇℃伅
+ // 娉ㄦ剰锛氳繖閲屽彧鏄ず渚嬶紝瀹為檯鍙兘闇�瑕佹牴鎹笟鍔￠渶姹傝皟鏁�
result.Add(item);
}
@@ -571,4 +616,68 @@
throw new Exception(ex.Message);
}
}
+
+ /// <summary>
+ /// 鐢熸垚绌村彿淇℃伅
+ /// </summary>
+ /// <param name="mnum">寮�绌存�绘暟</param>
+ /// <param name="dnum">鍫电┐鍙凤紙閫楀彿鍒嗛殧锛�</param>
+ /// <param name="snum">閫佹鎵规暟</param>
+ /// <returns>绌村彿淇℃伅鍒楄〃</returns>
+ private List<HoleNumberInfo> GenerateHoleNumbers(decimal? mnum, string? dnum, decimal? snum)
+ {
+ var result = new List<HoleNumberInfo>();
+
+ if (mnum == null || mnum <= 0 || snum == null || snum <= 0)
+ return result;
+
+ // 瑙ｆ瀽鍫电┐鍙�
+ var blockedHoles = new HashSet<int>();
+ if (!string.IsNullOrEmpty(dnum))
+ {
+ var holeNumbers = dnum.Split(',', StringSplitOptions.RemoveEmptyEntries);
+ foreach (var holeStr in holeNumbers)
+ {
+ if (int.TryParse(holeStr.Trim(), out int holeNum))
+ {
+ blockedHoles.Add(holeNum);
+ }
+ }
+ }
+
+ int totalHoles = (int)mnum.Value;
+ int batchCount = (int)snum.Value; // 閫佹鎵规暟
+
+ // 璁＄畻鎬荤紪鍙锋暟閲忥細寮�绌存�绘暟 脳 閫佹鎵规暟
+ int totalIndexes = totalHoles * batchCount;
+
+ for (int i = 1; i <= totalIndexes; i++)
+ {
+ // 绌村彿寰幆锛�1-8, 1-8...
+ int holeNumber = ((i - 1) % totalHoles) + 1;
+ bool isBlocked = blockedHoles.Contains(holeNumber);
+
+ result.Add(new HoleNumberInfo
+ {
+ Index = i,
+ HoleNumber = holeNumber,
+ IsBlocked = isBlocked,
+ RecordValue = isBlocked ? "/" : null,
+ CheckResult = isBlocked ? "/" : null
+ });
+ }
+
+ // 鎺掑簭锛氬牭绌存帓鏈�鍚庝紭鍏堢骇绗竴锛岀劧鍚庣┐鍙蜂粠灏忓埌澶ф帓锛岀┐鍙风浉鍚岀殑鎺掍竴璧�
+ result = result.OrderBy(x => x.IsBlocked) // 鍫电┐鎺掓渶鍚庯紙false鍦ㄥ墠锛宼rue鍦ㄥ悗锛�
+ .ThenBy(x => x.HoleNumber) // 绌村彿浠庡皬鍒板ぇ
+ .ToList();
+
+ // 閲嶆柊璁剧疆Index锛屼繚鎸佽繛缁紪鍙�
+ for (int i = 0; i < result.Count; i++)
+ {
+ result[i].Index = i + 1;
+ }
+
+ return result;
+ }
}
\ No newline at end of file
diff --git a/StandardInterface/MESApplication/Controllers/QC/LljController.cs b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
index a206bee..9da435c 100644
--- a/StandardInterface/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
@@ -476,4 +476,68 @@
return Ok();
}
+
+ [HttpPost("getWomdab")]
+ public ResponseResult getWomdab([FromBody] JObject data)
+ {
+ var daa001 = data["daa001"]?.ToString();
+ try
+ {
+ dynamic resultInfos = new System.Dynamic.ExpandoObject();
+ var tbBillList = new LljService().GetWomdab(daa001);
+ if (tbBillList == null || tbBillList.Count == 0)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ユ楠屽崟鏈笂浼犻檮浠朵俊鎭紒",
+ data = null
+ };
+ }
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("GetWomdabById")]
+ public ResponseResult GetWomdabById([FromBody] JObject data)
+ {
+ var daa001 = data["daa001"]?.ToString();
+ var ItemNo = data["ItemNo"]?.ToString();
+ try
+ {
+ dynamic resultInfos = new System.Dynamic.ExpandoObject();
+ var tbBillList = new LljService().GetWomdabById(daa001,ItemNo);
+ if (tbBillList == null || tbBillList.Count == 0)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ユ楠屽崟鏈笂浼犻檮浠朵俊鎭紒",
+ data = null
+ };
+ }
+ 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
--
Gitblit v1.9.3