From f9c7f114f3eabb14532bca76671598b130f91aeb Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 24 九月 2025 16:47:52 +0800
Subject: [PATCH] SJ，LLJ,RKJ修改
---
StandardInterface/MES.Service/service/QC/SJService.cs | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 322 insertions(+), 23 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index cdd8865..91e8c9e 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Data;
namespace MES.Service.service.QC;
@@ -30,7 +31,7 @@
number = no.ToString().PadLeft(4, '0');
}
- return "SJN" + date.Replace("-", "") + number;
+ return "SJ" + date.Replace("-", "") + number;
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
@@ -52,11 +53,11 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
+ a => a.Fsubmit == 0)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�");
+ a => a.Fsubmit == 1);
// 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
@@ -177,14 +178,42 @@
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>()
- .Where(s => array.Contains(s.Pid))
+ .Where(s => array.Contains(s.Pid) && s.FcheckResu != "/")
.GroupBy(s => s.Pid)
.Select(s => new
{
@@ -203,12 +232,59 @@
else
{
s.isCheck = find.count;
- if (find.count == s.LevelNum && s.IsPass == 1)
- s.result = "鍚堟牸";
- else if (find.count == s.LevelNum && s.IsPass == 0)
- s.result = "涓嶅悎鏍�";
+
+ // 璁＄畻瀹為檯闇�瑕佹楠岀殑鏁伴噺锛堟帓闄ゅ牭绌达級
+ int actualRequiredCount = (int)(s.LevelNum ?? 0);
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ actualRequiredCount = s.HoleNumbers.Count(h => !h.IsBlocked);
+ }
+
+ // 璋冭瘯淇℃伅锛氱粨鏋滃垽瀹�
+ Console.WriteLine($"getQSItems: Pid={s.Id}, find.count={find.count}, actualRequiredCount={actualRequiredCount}, IsPass={s.IsPass}");
+
+ // 濡傛灉鏈夋楠岃褰曪紝鏍规嵁鍚堟牸鎯呭喌鍒ゆ柇鐘舵��
+ if (find.count > 0)
+ {
+ // 鑾峰彇鍚堟牸鏁伴噺
+ var passCount = db.Queryable<QsItemIpiItemDetail>()
+ .Where(a => a.Pid == s.Id && a.Fstand == "鈭�" && a.FcheckResu != "/").Count();
+
+ // 鑾峰彇涓嶅悎鏍兼暟閲�
+ var failCount = db.Queryable<QsItemIpiItemDetail>()
+ .Where(a => a.Pid == s.Id && a.Fstand == "脳" && a.FcheckResu != "/").Count();
+
+ // 濡傛灉鏈変笉鍚堟牸璁板綍锛岀洿鎺ユ樉绀轰笉鍚堟牸
+ if (failCount > 0)
+ {
+ s.result = "涓嶅悎鏍�";
+ }
+ // 濡傛灉鍏ㄩ儴鍚堟牸涓旀暟閲忓尮閰嶏紝鏄剧ず鍚堟牸
+ else if (passCount == actualRequiredCount && find.count == actualRequiredCount)
+ {
+ s.result = "鍚堟牸";
+ }
+ // 濡傛灉閮ㄥ垎瀹屾垚锛屾樉绀鸿繘琛屼腑
+ else if (find.count < actualRequiredCount)
+ {
+ s.result = "杩涜涓�";
+ }
+ // 濡傛灉鍏ㄩ儴瀹屾垚浣嗗悎鏍兼暟閲忎笉瓒筹紝鏄剧ず涓嶅悎鏍�
+ else if (find.count == actualRequiredCount && passCount < actualRequiredCount)
+ {
+ s.result = "涓嶅悎鏍�";
+ }
+ // 鍏朵粬鎯呭喌鏄剧ず杩涜涓�
+ else
+ {
+ s.result = "杩涜涓�";
+ }
+ }
else
+ {
s.result = "鏈畬鎴�";
+ }
}
});
@@ -226,6 +302,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;
}
@@ -262,7 +348,24 @@
detail.Fstand = "鈭�";
detail.FcheckResu = "1";
detail.UpdateBy = item.From.StatusUser;
- detail.count = (int?)s.LevelNum;
+
+ // 璁＄畻榛樿鍚堟牸鐨勬暟閲忥細(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻寮�绌存暟鍜屽牭绌存暟
+ int openHoles = s.HoleNumbers.Count(h => !h.IsBlocked); // 寮�绌存暟
+ int blockedHoles = s.HoleNumbers.Count(h => h.IsBlocked); // 鍫电┐鏁�
+ int checkCount = (int)(s.LevelNum ?? 1); // 妫�楠屾暟
+
+ // 璁＄畻锛�(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ detail.count = (checkCount * openHoles) - (checkCount * blockedHoles);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ detail.count = (int?)s.LevelNum;
+ }
+
SetQSItemDetail(detail);
});
@@ -298,7 +401,24 @@
detail.Fstand = "鈭�";
detail.FcheckResu = "1";
detail.UpdateBy = item.StatusUser;
- detail.count = (int?)s.LevelNum;
+
+ // 璁＄畻榛樿鍚堟牸鐨勬暟閲忥細(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻寮�绌存暟鍜屽牭绌存暟
+ int openHoles = s.HoleNumbers.Count(h => !h.IsBlocked); // 寮�绌存暟
+ int blockedHoles = s.HoleNumbers.Count(h => h.IsBlocked); // 鍫电┐鏁�
+ int checkCount = (int)(s.LevelNum ?? 1); // 妫�楠屾暟
+
+ // 璁＄畻锛�(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ detail.count = (checkCount * openHoles) - (checkCount * blockedHoles);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ detail.count = (int?)s.LevelNum;
+ }
+
SetQSItemDetail(detail);
});
@@ -312,6 +432,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();
@@ -321,6 +445,9 @@
item.FcheckResu = detail.FcheckResu;
item.CreateBy = detail.UpdateBy;
item.CreateDate = DateTime.Now;
+
+ // 濡傛灉鏈夎捣濮嬬储寮曪紝鍙互鍦ㄨ繖閲岃缃浉鍏崇殑绱㈠紩淇℃伅
+ // 娉ㄦ剰锛氳繖閲屽彧鏄ず渚嬶紝瀹為檯鍙兘闇�瑕佹牴鎹笟鍔￠渶姹傝皟鏁�
result.Add(item);
}
@@ -356,17 +483,38 @@
if (qsItemIpiItem == null) return 0;
var count = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid).Count();
+ .Where(s => s.Pid == detail.Pid && s.FcheckResu != "/").Count();
+ // 璁＄畻瀹為檯闇�瑕佹楠岀殑鏁伴噺锛堟帓闄ゅ牭绌达級
+ var actualRequiredCount = qsItemIpiItem.LevelNum;
+ if (qsItemIpiItem.HoleNumbers != null && qsItemIpiItem.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ actualRequiredCount = qsItemIpiItem.HoleNumbers.Count(h => !h.IsBlocked);
+ }
var result = 0;
- if (qsItemIpiItem.LevelNum != count) return 0;
+ // 姣旇緝瀹為檯闇�瑕佹楠岀殑鏁伴噺鍜屽疄闄呮楠岃褰曟暟閲�
+ if (actualRequiredCount != count)
+ {
+ // 璋冭瘯淇℃伅锛氳褰曟暟閲忎笉鍖归厤
+ Console.WriteLine($"autoResult: actualRequiredCount={actualRequiredCount}, count={count}, Pid={detail.Pid}");
+ // 鍗充娇鏁伴噺涓嶅尮閰嶏紝涔熻缁х画鎵ц鍚庣画閫昏緫鏉ユ洿鏂癐S_PASS瀛楁
+ // return 0; // 娉ㄩ噴鎺夎繖琛岋紝璁╂柟娉曠户缁墽琛�
+ }
var passCount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�").Count();
+ .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�" && s.FcheckResu != "/").Count();
- if (count == passCount) result = 1;
+ // 璋冭瘯淇℃伅锛氱粺璁′俊鎭�
+ Console.WriteLine($"autoResult: count={count}, passCount={passCount}, Pid={detail.Pid}");
+
+ // 鍙湁鍦ㄦ暟閲忓尮閰嶆椂鎵嶈繘琛屽悎鏍兼�у垽鏂�
+ if (actualRequiredCount == count && count == passCount)
+ {
+ result = 1;
+ }
var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
db =>
@@ -381,14 +529,30 @@
//鑷姩鍒ゅ畾鏄惁鍚堟牸
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩悊璁轰釜鏁�
- var sum = db.Queryable<QsItemIpiItem>()
- .Where(s => s.Pid == detail.Gid).Sum(it => it.LevelNum);
- if (sum == null || sum == 0) return 1;
+ //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩疄闄呴渶瑕佹楠屼釜鏁帮紙鎺掗櫎鍫电┐锛�
+ var sum = 0;
+ var qsItems = db.Queryable<QsItemIpiItem>()
+ .Where(s => s.Pid == detail.Gid).ToList();
+
+ foreach (var item in qsItems)
+ {
+ if (item.HoleNumbers != null && item.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ sum += item.HoleNumbers.Count(h => !h.IsBlocked);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ sum += (int)(item.LevelNum ?? 0);
+ }
+ }
+
+ if (sum == 0) return 1;
- //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁�
+ //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁帮紙鎺掗櫎鍫电┐锛�
var icount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Gid == detail.Gid).Count();
+ .Where(s => s.Gid == detail.Gid && s.FcheckResu != "/").Count();
if (icount == 0) return 1;
@@ -501,4 +665,139 @@
return withOracle;
}
+ //鍒锋柊妫�楠岄」鐩�
+ public (int result, string message) GenUpdate(decimal? id, string? no, string? user, decimal? mnum = null, string? dnum = null)
+ {
+ var outputResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000);
+ var outputMessage = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, ParameterDirection.Output, 4000);
+
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
+ new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
+ new("P_MNUM", mnum ?? 1, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_DNUM", dnum ?? "", System.Data.DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_GEN_UPDATE(:P_ID,:P_NO,:P_MNUM,:P_DNUM,:P_USER, :PO_RESULT, :PO_TEXT); END;",
+ parameters.ToArray());
+
+ int result = outputResult.Value == null ? -1 : Convert.ToInt32(outputResult.Value);
+ string message = outputMessage.Value?.ToString() ?? "";
+
+ return (result, message);
+ }
+
+ public bool SjSubmit(SJDto dto)
+ {
+ try
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("c_res", null,
+ System.Data.DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("c_msg", null,
+ System.Data.DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟锛屽浐瀹欶LAG涓�1锛堝鏍革級
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", dto.id, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_FLAG", 1, System.Data.DbType.Int32, ParameterDirection.Input),
+ new("P_USER", dto.userNo, System.Data.DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_WOMDAA_SJ_UPDATE_RES(:P_ID, :P_FLAG, :P_USER, :c_res, :c_msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ 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
--
Gitblit v1.9.3