From 646ac6f3e1e77d0481e46ea15a6eb6db4ecba065 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 23 六月 2025 13:17:23 +0800
Subject: [PATCH] 11
---
MES.Service/service/QC/RKJService.cs | 172 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 59 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 4963929..f26b366 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -1,4 +1,6 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Net.NetworkInformation;
+using Masuit.Tools.Models;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
@@ -54,13 +56,10 @@
//鑾峰彇宸ュ崟鍙�
- public List<RKJDaa001> GetDaa001s(string lineNo)
+ 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;
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
@@ -229,10 +228,15 @@
{
var commit = 0;
- xj.CreateBy = userNo;
- xj.CreateDate = DateTime.Now;
+ // xj.CreateBy = userNo;
+ // xj.CreateDate = DateTime.Now;
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
+ var qsItemOqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s => s.Id == xj.Id)
+ .First();
+
+ decimal? pid = 0;
+ pid = qsItemOqcReq == null ? db.Insertable(xj).ExecuteReturnIdentity() : qsItemOqcReq.Id;
xj.Id = pid;
@@ -401,9 +405,26 @@
.ExecuteCommand();
});
- if (FcheckResu.Equals("涓嶅悎鏍�"))
- //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
- saveDetect02(detail.Gid, detail.CreateBy);
+ //if (FcheckResu.Equals("涓嶅悎鏍�"))
+ // //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
+ // saveDetect02(detail.Gid, detail.CreateBy);
+
+
+ var oqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s => s.Id == detail.Gid)
+ .Select<string?>(s=>s.BillNo)
+ .First();
+
+ if (oqcReq != null)
+ {
+ //FSTATUS
+ //CHECK_RES
+ db.Updateable<MesInvItemIns>()
+ .SetColumns(s => s.Fstatus == 1)
+ .SetColumns(s=>s.CheckRes == FcheckResu)
+ .Where(s => s.BillNo == oqcReq)
+ .ExecuteCommand();
+ }
return useTransactionWithOracle;
}
@@ -418,14 +439,14 @@
var mesInvItemIns = db.Queryable<MesInvItemIns>()
.Single(s => s.BillNo == qsItemOqcReq.BillNo);
- var mesSchemeResult = db.Queryable<MesSchemeResult>()
- .Single(s => s.BillNo == mesInvItemIns.CbillNo);
+ var mesSchemeResult = db.Queryable<Womdaa>()
+ .Single(s => s.Daa001 == mesInvItemIns.CbillNo);
var entity = new MesQaItemsDetect02();
- entity.ItemNo = mesSchemeResult.BoardItem;
- entity.BoardItem = mesSchemeResult.BoardItem;
- entity.LineNo = mesSchemeResult.LineNo;
- entity.Aufnr = mesSchemeResult.TaskNo;
+ // entity.ItemNo = mesSchemeResult.BoardItem;
+ // entity.BoardItem = mesSchemeResult.BoardItem;
+ entity.LineNo = mesSchemeResult.Daa015;
+ // entity.Aufnr = mesSchemeResult.TaskNo;
entity.ReleaseNo = qsItemOqcReq.ReleaseNo;
entity.LotNo = qsItemOqcReq.BillNo;
entity.FcheckDate = qsItemOqcReq.FcheckDate;
@@ -453,52 +474,61 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
- var id = Convert.ToDecimal(queryObj.id);
+ var totalCount = 0;
- string[]? lineNo = null;
+ var qsItemOqcReqs = db.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)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
+ (a, b, c, da, ca, m, l) => a.ReleaseNo.Contains(queryObj.SearchValue)
+ || b.ItemNo.Contains(queryObj.SearchValue)
+ )
+ .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, ref totalCount);
- if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
-
- return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.BillNo == b.BillNo))
- .WhereIF(lineNo != null && lineNo.Length > 0,
- (a, b) => lineNo.Contains(b.LineNo))
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu != null)
- .WhereIF(id > 0, (a, b) => a.Id == id)
- .Select((a, b) => new QsItemOqcReq
- {
- Id = a.Id,
- ReleaseNo = a.ReleaseNo,
- BillNo = a.BillNo,
- LineName = b.LineNo,
- Quantity = b.Quantity,
- CreateBy = a.CreateBy,
- CreateDate = a.CreateDate,
- ItemNo = a.ItemNo,
- Mocode = b.Mocode,
- BoardModel = b.BoardModel,
- TaskNo = b.TaskNo,
- FcheckResu = a.FcheckResu,
- FcheckBy = a.FcheckBy,
- FcheckDate = a.FcheckDate,
- MoidNum = a.MoidNum,
- BoardName = b.BoardName,
- ColorName = b.ColorName,
- Remarks = a.Remarks
- }).OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ return (qsItemOqcReqs, totalCount);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
@@ -651,4 +681,28 @@
return Convert.ToInt32(rkjDto.gid);
}
+
+ public List<MesInvItemInCDetails2> GetRKDetail(RKJDto rkjDto)
+ {
+ //鐗╂枡鏉＄爜鍜岀墿鏂欑紪鐮侊紝鏁伴噺 MES_INV_ITEM_IN_C_DETAILS2
+ var db = SqlSugarHelper.GetInstance();
+
+ var oqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s => s.Id == rkjDto.gid)
+ .Select<string?>(s => s.BillNo)
+ .First();
+
+ if (oqcReq != null)
+ {
+ //FSTATUS
+ //CHECK_RES
+ var mesInvItemIns = db.Queryable<MesInvItemIns>()
+ .Where(s => s.BillNo == oqcReq).First();
+
+ return db.Queryable<MesInvItemInCDetails2>()
+ .Where(a=>a.ItemInId == mesInvItemIns.Id).ToList();
+ }
+
+ return new List<MesInvItemInCDetails2>();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3