From 2923b57174c59c6b07e3ac7502c41fa60e32ae33 Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期五, 09 五月 2025 17:49:20 +0800
Subject: [PATCH] 入库、首检、巡检
---
MES.Service/service/QC/RKJService.cs | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 4bda309..815f2a2 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -455,43 +455,48 @@
var db = SqlSugarHelper.GetInstance();
return db
- .Queryable<QsItemOqcReq, Womdaa, MesItems, MesInvItemIns, Womdab,
- MesInvTransaction, RKJDaa001>(
- (a, da, b, c, d, ca, m) => new JoinQueryInfos(
- JoinType.Left, da.Daa001 == a.BillNo,
- JoinType.Left, a.ItemId == b.Id,
- JoinType.Left, a.BillNo == c.BillNo,
- JoinType.Left, c.CbillNo == d.Dab001,
- JoinType.Left,
- c.TransctionNo == ca.TransactionNo.ToString() &&
- c.Company == ca.Company && c.Factory == ca.Factory,
- JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo
- ))
- .Select((a, da, b, c, d, ca, m) => new QsItemOqcReq
- {
- BillNo = a.BillNo,
- Remarks = a.Remarks,
- Id = a.Id,
- CreateDate = a.CreateDate,
- CreateBy = a.CreateBy,
- FcheckResu = a.FcheckResu,
- ItemNo = a.ItemNo,
- FcheckBy = a.FcheckBy,
- FcheckDate = a.FcheckDate,
- ReleaseNo = a.ReleaseNo,
- // 娣诲姞鍏朵粬瀛楁
- // 濡傛灉鍦� QsItemOqcReq 涓畾涔変簡棰濆瀛楁锛屽垯闇�瑕佸皢瀹冧滑璧嬪��
- // 渚嬪:
- ItemName = b.ItemName,
- ItemModel = b.ItemModel,
- TaskNo = c.TaskNo,
- CbillNo = c.CbillNo,
- Dab001 = d.Dab001,
- Daa015 = da.Daa015,
- LineNo = c.LineNo,
- Quantity = m.Quantity
- }).OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa, MesInvTransaction, RKJDaa001, MesLine>(
+ (a, b, c, da, ca, m, l) => new JoinQueryInfos(
+ JoinType.Left, a.ItemNo == b.Id.ToString(),
+ JoinType.Left, a.BillNo == c.BillNo,
+ JoinType.Left, da.Daa001 == c.RbillNo,
+ JoinType.Left, c.TransctionNo == ca.TransactionNo.ToString()
+ && c.Company == ca.Company
+ && c.Factory == ca.Factory,
+ JoinType.Left, m.ItemInId == c.Id,
+ JoinType.Left, l.LineNo == da.Daa015
+ ))
+ //.WhereIF(!"PL017".Equals(queryObj.createUser),
+ // (a, b, c, da, ca, m) => lineNo.Contains(da.Daa015))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.id), (a, b, c, da, ca, m, l) => a.Id.ToString() == queryObj.id)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) && "鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, da, ca, m, l) => a.FcheckResu == null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, da, ca, m, l) => a.FcheckResu != null)
+ .Select((a, b, c, da, ca, m, l) => new QsItemOqcReq
+ {
+ BillNo = a.BillNo,
+ Remarks = a.Remarks,
+ Id = a.Id,
+ CreateDate = a.CreateDate,
+ CreateBy = a.CreateBy,
+ FcheckResu = a.FcheckResu,
+ ItemNo = b.ItemNo,
+ FcheckBy = a.FcheckBy,
+ FcheckDate = a.FcheckDate,
+ ReleaseNo = a.ReleaseNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
+ TaskNo = c.RbillNo,
+ //CbillNo = c.CbillNo,
+ //LineNo = da.Daa015,
+ LineNo = l.LineName,
+ Quantity = m.Quantity
+ })
+ .OrderBy(a => a.CreateDate, OrderByType.Desc)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
--
Gitblit v1.9.3