From a3a5db87cd11f10efd42eee49e7977c5360e1b55 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 06 八月 2025 15:11:51 +0800
Subject: [PATCH] 首检巡检，入库检验
---
MES.Service/service/QC/RKJService.cs | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index bdcaa01..442754b 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -233,9 +233,11 @@
xj.CreateBy = userNo;
xj.CreateDate = DateTime.Now;
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
+ // var pid = db.Insertable(xj).ExecuteReturnIdentity();
- xj.Id = pid;
+ var pid = (int)xj.Id;
+
+ // xj.Id = pid;
rkjDto.gid = pid;
@@ -458,34 +460,29 @@
{
var db = SqlSugarHelper.GetInstance();
var totalCount = 0;
+
- // 鑾峰彇鐢ㄦ埛鍏宠仈鐨勭嚎浣撶紪鍙�
- string[] lineNo = null;
- if (!string.IsNullOrEmpty(queryObj.createUser))
- {
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
- }
-
- var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa>((a, b, da) =>
+ var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa,MesLine>((a, b, da,c) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
- JoinType.Left, a.BillNo == da.Daa001 // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa015 == c.LineNo // 鍏宠仈宸ュ崟淇℃伅
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
// (a, b, da) => lineNo.Contains(da.Daa015))
// ID绮剧‘鏌ヨ
.WhereIF(!string.IsNullOrEmpty(queryObj.id),
- (a, b, da) => a.Id.ToString() == queryObj.id)
+ (a, b, da,c) => a.Id.ToString() == queryObj.id)
// 瀹屾垚鐘舵�佽繃婊�
- .WhereIF("鏈畬鎴�".Equals(queryObj.result), (a, b, da) => a.FcheckResu == null)
- .WhereIF(!"鏈畬鎴�".Equals(queryObj.result), (a, b, da) => a.FcheckResu != null)
+ .WhereIF("鏈畬鎴�".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu == null)
+ .WhereIF(!"鏈畬鎴�".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu != null)
// 鎼滅储鏉′欢锛堢墿鏂欏悕绉�/缂栧彿锛�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- (a, b, da) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
- a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ (a, b, da,c) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
// 鏌ヨ瀛楁
- .Select((a, b, da) => new QsItemOqcReq
+ .Select((a, b, da,c) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -500,7 +497,9 @@
ReleaseNo = a.ReleaseNo,
Remarks = a.Remarks,
Daa015 = da.Daa015, // 宸ュ崟绾夸綋
- Fsubmit = a.Fsubmit
+ Fsubmit = a.Fsubmit,
+ Quantity = da.Daa008,
+ LineNo = c.LineName
})
// 鎺掑簭
.OrderBy(a => a.CreateDate, OrderByType.Desc);
--
Gitblit v1.9.3