From cec90a62de5a66f258a4108f03688acfe93b4a66 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 13 十一月 2025 15:26:33 +0800
Subject: [PATCH] SJ,XJ,RKJ加拍照限制
---
StandardInterface/MES.Service/service/QC/RKJService.cs | 98 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 28 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 83a7b51..802b8e2 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -291,7 +291,8 @@
a.FcheckLevel,
a.FacLevel,
a.QsCode,
- a.QsName
+ a.QsName,
+ a.Forder
}).Select((a, b) => new QsItemOqcItem
{
ProjName = a.ProjName,
@@ -308,10 +309,11 @@
FacLevel = a.FacLevel,
QsCode = a.QsCode,
QsName = a.QsName,
+ Forder = a.Forder,
isCheck = SqlFunc.AggregateCount(b.Id),
Result = SqlFunc.AggregateCount(b.Id) == 0 ? "鏈畬鎴�" :
a.IsPass == 1 ? "鍚堟牸" : "涓嶅悎鏍�"
- }).OrderBy("result desc").ToList();
+ }).OrderBy("FORDER").ToList();
}
public dynamic save(RKJDto rkjDto)
@@ -610,49 +612,55 @@
return db
- .Queryable<QsItemOqcReq, Womdaa, MesItems>((a, da, b) =>
+ .Queryable<QsItemOqcReq, Womdaa, MesItems, MesLine>((a, da, b, m) =>
new JoinQueryInfos(
JoinType.Left, da.Daa001 == a.BillNo,
- JoinType.Left, a.ItemId == b.Id
+ JoinType.Left, a.ItemId == b.Id,
+ JoinType.Left, da.Daa015 == m.LineNo
))
.WhereIF(lineNo != null && lineNo.Length > 0,
- (a, da, b) => lineNo.Contains(da.Daa015))
+ (a, da, b, m) => lineNo.Contains(da.Daa015))
+ // 娣诲姞QC绛涢�夋潯浠讹細杞﹂棿鍜岀嚎浣�
+ .WhereIF(!string.IsNullOrEmpty(queryObj.departmentId),
+ (a, da, b, m) => m.DepotId.ToString() == queryObj.departmentId)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.lineId),
+ (a, da, b, m) => m.LineNo == queryObj.lineId)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, da, b) => a.FcheckResu == null || a.FcheckResu == "")
+ (a, da, b, m) => a.FcheckResu == null || a.FcheckResu == "")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, da, b) => a.FcheckResu != null && a.FcheckResu != "")
- .WhereIF(id > 0, (a, da, b) => a.Id == id)
+ (a, da, b, m) => a.FcheckResu != null && a.FcheckResu != "")
+ .WhereIF(id > 0, (a, da, b, m) => a.Id == id)
// 娣诲姞fsubmit瀛楁杩囨护閫昏緫 - 鍙湁鍦ㄦ槑纭寚瀹歠submit鍙傛暟鏃舵墠杩囨护锛屼笖娌℃湁浼犻�抜d鏃舵墠杩囨护
.WhereIF(
id <= 0 && StringUtil.IsNotNullOrEmpty(queryObj.fsubmit) && queryObj.fsubmit == "1",
- (a, da, b) => a.Fsubmit == 1)
+ (a, da, b, m) => a.Fsubmit == 1)
.WhereIF(
id <= 0 && StringUtil.IsNotNullOrEmpty(queryObj.fsubmit) && queryObj.fsubmit == "0",
- (a, da, b) => a.Fsubmit == 0 || a.Fsubmit == null)
+ (a, da, b, m) => a.Fsubmit == 0 || a.Fsubmit == null)
// 娣诲姞鎼滅储鏉′欢 - 鏍规嵁閫夋嫨鐨勬悳绱㈠瓧娈佃繘琛岀簿纭悳绱�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "billNo", // 宸ュ崟
- (a, da, b) => a.BillNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.BillNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "releaseNo", // 妫�楠屽崟鍙�
- (a, da, b) => a.ReleaseNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.ReleaseNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "daa015", // 浜х嚎
- (a, da, b) => da.Daa015.Contains(queryObj.SearchValue))
+ (a, da, b, m) => da.Daa015.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemNo", // 鐗╂枡缂栫爜
- (a, da, b) => a.ItemNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.ItemNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemName", // 鐗╂枡鍚嶇О
- (a, da, b) => b.ItemName.Contains(queryObj.SearchValue))
+ (a, da, b, m) => b.ItemName.Contains(queryObj.SearchValue))
// 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
.WhereIF(string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue),
- (a, da, b) =>
+ (a, da, b, m) =>
a.ItemNo.Contains(queryObj.SearchValue) ||
b.ItemName.Contains(queryObj.SearchValue) ||
a.BillNo.Contains(queryObj.SearchValue) ||
a.ReleaseNo.Contains(queryObj.SearchValue) ||
da.Daa015.Contains(queryObj.SearchValue))
- .Select((a, da, b) => new QsItemOqcReq
+ .Select((a, da, b, m) => new QsItemOqcReq
{
Id = a.Id,
ReleaseNo = a.ReleaseNo,
@@ -867,11 +875,13 @@
/// <param name="id">妫�楠屽崟ID</param>
/// <param name="userNo">鎻愪氦鐢ㄦ埛</param>
/// <returns>鏇存柊缁撴灉</returns>
- public int SubmitInspection(decimal id, string userNo)
+ public bool SubmitInspection(decimal id, string userNo)
{
- return SqlSugarHelper.UseTransactionWithOracle(db =>
+ try
{
- // 鑾峰彇妫�楠屽崟璇︾粏淇℃伅
+ var db = SqlSugarHelper.GetInstance();
+
+ // 鍏堣幏鍙栨楠屽崟璇︾粏淇℃伅锛堢敤浜庨拤閽夋帹閫佸垽鏂級
var inspectionData = db.Queryable<QsItemOqcReq>()
.Where(it => it.Id == id)
.First();
@@ -881,6 +891,40 @@
throw new Exception("妫�楠屽崟涓嶅瓨鍦�");
}
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("PO_RESULT", null,
+ System.Data.DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("PO_MSG", 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_USER", userNo, System.Data.DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_RKJ_UPDATE_SH(:P_ID, :P_USER, :PO_RESULT, :PO_MSG); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ // 濡傛灉杩斿洖缁撴灉涓嶄负0锛岃〃绀哄け璐�
+ if ("1".Equals(resultValue))
+ {
+ throw new Exception(messageValue ?? "鎻愪氦澶辫触");
+ }
+
+ // 瀛樺偍杩囩▼鎵ц鎴愬姛鍚庯紝澶勭悊閽夐拤鎺ㄩ�侀�昏緫
// 妫�鏌ラ拤閽夋帹閫佹潯浠讹細PSZT涓哄緟鍒わ紝涓斾笉鑹師鍥犮�佷笉鑹弿杩般�佹墍灞炶溅闂翠笉涓虹┖
bool shouldPushToDingTalk = inspectionData.Pszt == "寰呭垽" &&
!string.IsNullOrEmpty(inspectionData.Blyy) &&
@@ -942,14 +986,12 @@
}
}
- // 鏇存柊妫�楠屽崟鐘舵��
- return db.Updateable<QsItemOqcReq>()
- .SetColumns(it => it.Fsubmit == 1) // 璁剧疆鎻愪氦鐘舵�佷负1锛堝凡鎻愪氦锛�
- .SetColumns(it => it.FcheckBy == userNo) // 璁剧疆妫�楠屼汉
- .SetColumns(it => it.FcheckDate == DateTime.Now) // 璁剧疆妫�楠屾椂闂�
- .Where(it => it.Id == id)
- .ExecuteCommand();
- });
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
/// <summary>
--
Gitblit v1.9.3