From 4fa3f2b7d70af1539cf2731d7c54cc9769b0e14d Mon Sep 17 00:00:00 2001 From: zyf <1071160500@qq.com> Date: 星期五, 15 十一月 2024 09:37:00 +0800 Subject: [PATCH] 委外变更单更新开工状态 --- MES.Service/service/QC/RKJService.cs | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs index 9acf1c2..e464b5a 100644 --- a/MES.Service/service/QC/RKJService.cs +++ b/MES.Service/service/QC/RKJService.cs @@ -57,11 +57,10 @@ public List<RkDaa002> GetDaa001s(string lineNo) { var db = SqlSugarHelper.GetInstance(); - // return db.Queryable<RKJDaa001>() - // .Where(t => t.LineNo == lineNo) - // .OrderBy(t => t.BillNo, OrderByType.Desc) - // .ToList(); - return null; + return db.Queryable<RkDaa002>() + .Where(t => lineNo.Contains(t.Daa020)) + .OrderBy(t => t.BillNo, OrderByType.Desc) + .ToList(); } //鏍规嵁妫�楠屾爣鍑嗘潵璁$畻妫�楠屼釜鏁� @@ -600,8 +599,8 @@ var qsItemOqcReqs = db .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction, - RKJDaa001, Womdaa, VLineUser>( - (a, b, c, ca, m, da, z) => new JoinQueryInfos( + RKJDaa001, Womdaa, VLineUser,MesDeptUser>( + (a, b, c, ca, m, da, z,d) => new JoinQueryInfos( JoinType.Left, a.ItemNo == b.ItemNo, JoinType.Left, a.BillNo == c.BillNo, JoinType.Left, @@ -610,25 +609,27 @@ c.Factory == ca.Factory, JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo, JoinType.Left, da.Daa001 == c.RbillNo, - JoinType.Left, da.Daa015 == z.LineNo + JoinType.Left, da.Daa015 == z.LineNo, + JoinType.Left,c.Bgr == d.UserNo )) // .WhereIF(lineNo != null && lineNo.Length > 0, // (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015)) .WhereIF(!"PL017".Equals(queryObj.createUser), - (a, b, c, ca, m, da, z) => lineNo.Contains(da.Daa015)) + (a, b, c, ca, m, da, z,d) => lineNo.Contains(da.Daa015)) .WhereIF(!string.IsNullOrEmpty(queryObj.id), - (a, b, c, ca, m, da, z) => a.Id.ToString() == queryObj.id) + (a, b, c, ca, m, da, z,d) => a.Id.ToString() == queryObj.id) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && "鏈畬鎴�".Equals(queryObj.result), - (a, b, c, ca, m, da, z) => a.FcheckResu == null) + (a, b, c, ca, m, da, z,d) => a.FcheckResu == null) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result), - (a, b, c, ca, m, da, z) => a.FcheckResu != null) - .Select((a, b, c, ca, m, da, z) => new QsItemOqcReq + (a, b, c, ca, m, da, z,d) => a.FcheckResu != null) + .Select((a, b, c, ca, m, da, z,d) => new QsItemOqcReq { BillNo = a.BillNo, + Fsubmit = a.Fsubmit, Remarks = a.Remarks, Id = a.Id, CreateDate = a.CreateDate, @@ -645,7 +646,7 @@ Daa015 = da.Daa015, LineNo = c.LineNo, Quantity = m.Quantity, - Bgr = c.Bgr + Bgr = d.UserName }) .OrderBy(a => a.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); @@ -846,12 +847,13 @@ private bool isRk(int? gid) { var db = SqlSugarHelper.GetInstance(); - return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2>( - (a, b, c) => new JoinQueryInfos( + return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,MesInvItemStocks>( + (a, b, c,d) => new JoinQueryInfos( JoinType.Inner, a.BillNo == b.BillNo, - JoinType.Inner, b.Id == c.ItemInId + JoinType.Inner, b.Id == c.ItemInId, + JoinType.Inner,c.ItemBarcode == d.ItemBarcode )) - .Where((a, b, c) => a.Id == gid) + .Where((a, b, c,d) => a.Id == gid) .Count() > 0; } } \ No newline at end of file -- Gitblit v1.9.3