From fa53abd5d374862c640da5310d0bd1bb641a0d5b Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 26 八月 2025 19:15:29 +0800
Subject: [PATCH] 检验查询功能新增、检验根据车间显示单据
---
MES.Service/service/QC/XJService.cs | 20 ++++++++--
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/QC/SJService.cs | 26 +++++++++---
MES.Service/Modes/QsQaItemXj.cs | 1
MES.Service/service/QC/RKJService.cs | 20 +++++++---
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/service/SJPageResult.cs | 3 +
MES.Service/Modes/MesUserDepartmentQc.cs | 29 ++++++++++++++
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Modes/QsItemOqcReq.cs | 1
MES.Service/Dto/service/XJPageResult.cs | 2
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
15 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index a8f8e48..d4972c9 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -109,4 +109,7 @@
//閿�鍞鍗曞彿
[SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? LoginUser { get; set; } //鐢ㄦ埛缂栫爜
+
+ [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
index 0920893..e76bf15 100644
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ b/MES.Service/Dto/service/XJPageResult.cs
@@ -10,5 +10,5 @@
public string? id { get; set; }
public string? SearchValue { get; set; }
- public string? statusUser { get; set; } //鐢ㄦ埛缂栫爜
+ public string? LoginUser { get; set; } //鐢ㄦ埛缂栫爜
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesUserDepartmentQc.cs b/MES.Service/Modes/MesUserDepartmentQc.cs
new file mode 100644
index 0000000..c2366b8
--- /dev/null
+++ b/MES.Service/Modes/MesUserDepartmentQc.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarTable("MES_USER_DEPARTMENT_QC")]
+ public class MesUserDepartmentQc
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="ID" )]
+ public decimal? Id { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="USERCODE" )]
+ public string Usercode { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="DEPARTMENTCODE" )]
+ public string Departmentcode { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index 0487518..6a70a8b 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -142,4 +142,5 @@
[SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
[SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
index 0b9a227..de640dd 100644
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ b/MES.Service/Modes/QsQaItemXj.cs
@@ -137,4 +137,5 @@
[SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
[SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
[SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 7c54ec9..72c394d 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 1766f40..9e67cf8 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index bb14c83..32b0285 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -522,14 +522,16 @@
var query = db
- .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
- da, c, us, ca) =>
+ .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b,
+ da, c, us, ca, d, dq) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
JoinType.Left, da.Daa015 == c.LineNo, // 鍏宠仈宸ュ崟淇℃伅
JoinType.Left, us.Fcode == a.CreateBy, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//鏌ヨ杞﹂棿
+ JoinType.Left, dq.Departmentcode == d.Departmentcode//鏌ヨ鐢ㄦ埛鏉冮檺
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -544,12 +546,17 @@
(a, b, da, c, us) => a.Fsubmit == 1)
// 鎼滅储鏉′欢锛堢墿鏂欏悕绉�/缂栧彿锛�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- (a, b, da, c, us) =>
+ (a, b, da, c, us,ca) =>
b.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower()
+ .Contains(queryObj.SearchValue.ToLower()) ||
a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ // 鏂板锛氱敤鎴穋ode杩囨护
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
// 鏌ヨ瀛楁
- .Select((a, b, da, c, us, ca) => new QsItemOqcReq
+ .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -568,7 +575,8 @@
Fsubmit = a.Fsubmit,
Quantity = da.Daa008,
LineNo = c.LineName,
- SaleOrderNo = ca.Caa015
+ SaleOrderNo = ca.Caa015,
+ DepartName = d.Departmentname
})
// 鎺掑簭
.OrderBy(a => a.CreateDate, OrderByType.Desc);
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 6b6cf31..555ec39 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -48,11 +48,14 @@
//if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
// lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
- var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
- da,ca) =>
+ var data = db.Queryable<SJPageResult, Womdaa, Womcaa, SysDepartment, MesUserDepartmentQc,MesItems> ((a,
+ da,ca,d,dq,i) =>
new JoinQueryInfos(
JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//鏌ヨ杞﹂棿
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, i.Id == Convert.ToDecimal(da.Daa002)//鏌ヨ鐢ㄦ埛鏉冮檺
))
//.WhereIF(lineNo != null && lineNo.Length > 0,
// a => lineNo.Contains(a.line))
@@ -67,7 +70,17 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.FSubmit == "1")
- .Select((a, da, ca) => new SJPageResult
+ //鍖归厤鏉冮檺
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (a, da, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ //鍖归厤鎼滅储瀛楃涓�
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (a, da, ca, d, dq,i) =>
+ a.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower())||
+ i.ItemName.ToLower() .Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((a, da, ca, d, dq) => new SJPageResult
{
Id = a.Id,
BillNo = a.BillNo,
@@ -91,9 +104,8 @@
Daa004 = a.Daa004,
Daa008 = a.Daa008,
LineName = a.LineName,
-
- // 鏄犲皠棰濆鐨勫瓧娈碉紙閿�鍞鍗曞彿锛�
- SaleOrder = ca.Caa015
+ SaleOrder = ca.Caa015,
+ DepartName = d.Departmentname
})
.OrderBy(a => a.CreateTime, OrderByType.Desc);
var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 5a900e3..51d78f7 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,14 +123,16 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
+ MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
JoinType.Left, s.ItemId == b.Id,
JoinType.Left, us.Fcode == s.CreateBy,
JoinType.Left, ca.Caa020 == a.Daa021,
- JoinType.Left, d.Departmentcode == c.Departmentcode
+ JoinType.Left, d.Departmentcode == c.Departmentcode,
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -145,7 +147,15 @@
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b, us) => s.SubmitStatus == 1)
.WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
- .Select((s, a, c, b, us,ca) => new QsQaItemXj
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (s, a, c, b, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (s, a, c, b, us, ca, d, dq,i) =>
+ s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -162,7 +172,9 @@
CheckBy = s.CheckBy,
CheckResult = s.CheckResult,
Remarks = s.Remarks,
- SaleOrder = ca.Caa015
+ SaleOrder = ca.Caa015,
+ DepartName = d.Departmentname
+
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
ref totalCount);
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 7c54ec9..72c394d 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 1766f40..9e67cf8 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 58aeefd..38932d5 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index b70ea75..c9f28b4 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 3d42834..eb3334d 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3