From 251dfa31818b7ae1803117b72376b82841f0c542 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 24 九月 2024 14:49:33 +0800
Subject: [PATCH] 入库检增加用户数据权限
---
MES.Service/service/QC/RKJService.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 589da1a..3adbcee 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -135,7 +135,8 @@
break;
}
- if (string.IsNullOrEmpty(LEV)) throw new Exception(item.QsCode+"涓嬬殑妫�楠屾按骞崇淮鎶ょ殑涓嶆纭�");
+ if (string.IsNullOrEmpty(LEV))
+ throw new Exception(item.QsCode + "涓嬬殑妫�楠屾按骞崇淮鎶ょ殑涓嶆纭�");
var sql =
"SELECT " + LEV +
@@ -146,12 +147,14 @@
var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
if (string.IsNullOrEmpty(maxBillNo))
- throw new Exception(item.QsCode+"涓嬫病鏈�" + quantity + "杩欎釜鑼冨洿鐨勬娊鏍峰熀鍑�");
+ throw new Exception(
+ item.QsCode + "涓嬫病鏈�" + quantity + "杩欎釜鑼冨洿鐨勬娊鏍峰熀鍑�");
var result = ExtractSubstring(item.FacLevel, '(', ')');
if (string.IsNullOrEmpty(result))
- throw new Exception(item.QsCode+"缁存姢鐨勬帴鏀舵按骞充笉姝ｇ‘锛屽簲璇ユ槸0.010---(AQL_0_0010)杩欐牱");
+ throw new Exception(item.QsCode +
+ "缁存姢鐨勬帴鏀舵按骞充笉姝ｇ‘锛屽簲璇ユ槸0.010---(AQL_0_0010)杩欐牱");
sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
" Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
@@ -470,6 +473,11 @@
var totalCount = 0;
+ string[]? lineNo = null;
+
+ if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
+ lineNo = _baseService.getUserLineNo(queryObj.createUser);
+
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
RKJDaa001, Womdaa>(
@@ -483,6 +491,9 @@
JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
JoinType.Left, da.Daa001 == c.RbillNo
))
+ // .WhereIF(lineNo != null && lineNo.Length > 0,
+ // (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
+ .Where((a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
.WhereIF(!string.IsNullOrEmpty(queryObj.id),
(a, b, c, ca, m, da) => a.Id.ToString() == queryObj.id)
.WhereIF(
--
Gitblit v1.9.3