From 27bd7530f8c1334b9338dea64002164bd74de8ac Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 30 五月 2025 14:50:25 +0800
Subject: [PATCH] 入库检验的逻辑修改
---
MES.Service/service/QC/RKJService.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 48afe60..457fdbe 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -1,4 +1,5 @@
锘縰sing System.Net.NetworkInformation;
+using Masuit.Tools.Models;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -58,6 +59,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;
}
@@ -227,11 +232,16 @@
{
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;
rkjDto.gid = pid;
@@ -468,12 +478,13 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
- return db
- .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa, MesInvTransaction, RKJDaa001, MesLine>(
+ var totalCount = 0;
+
+ 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,
@@ -493,6 +504,11 @@
.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,
@@ -514,7 +530,9 @@
Quantity = m.Quantity
})
.OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (qsItemOqcReqs, totalCount);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
@@ -667,4 +685,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