From 419621898f66c6c6dbad382923cd05938dd358cc Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 21 九月 2024 09:43:12 +0800
Subject: [PATCH] 入库检更改
---
MES.Service/Dto/service/RKJDaa001.cs | 5 ++++-
MESApplication/Controllers/QC/RKJController.cs | 7 ++++---
MES.Service/service/QC/RKJService.cs | 48 +++++++++++++++++++++++++++++-------------------
3 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/MES.Service/Dto/service/RKJDaa001.cs b/MES.Service/Dto/service/RKJDaa001.cs
index e7a61de..b9cef94 100644
--- a/MES.Service/Dto/service/RKJDaa001.cs
+++ b/MES.Service/Dto/service/RKJDaa001.cs
@@ -15,8 +15,11 @@
// 浠诲姟鍗曞彿
[SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; }
- [SugarColumn(ColumnName = "ITEM_NAME")]
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
public string? ItemName { get; set; }
+
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string? LotNo { get; set; }
// 璁㈠崟鏁伴噺
[SugarColumn(ColumnName = "QUANTITY")]
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 8656f8a..3f2b5b6 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -454,24 +454,36 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+
+ int totalCount = 0;
- 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,
+ var qsItemOqcReqs = db
+ .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
+ RKJDaa001, Womdaa>(
+ (a, b, c, ca, m, da) => new JoinQueryInfos(
+ JoinType.Left, a.ItemNo == b.ItemNo,
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
+ c.Company == ca.Company &&
+ c.Factory == ca.Factory,
+ JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
+ JoinType.Left, da.Daa001 == c.RbillNo
))
- .Select((a, da, b, c, d, ca, m) => new QsItemOqcReq
+ .WhereIF(!string.IsNullOrEmpty(queryObj.id),
+ (a, b, c, ca, m, da) => a.Id.ToString() == queryObj.id)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ "鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, ca, m, da) => a.FcheckResu == null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ !"鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, ca, m, da) => a.FcheckResu != null)
+ .Select((a, b, c, ca, m, da) => new QsItemOqcReq
{
BillNo = a.BillNo,
Remarks = a.Remarks,
@@ -483,19 +495,17 @@
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,
+ Dab001 = m.LotNo,
Daa015 = da.Daa015,
LineNo = c.LineNo,
Quantity = m.Quantity
- }).OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ })
+ .OrderBy(a => a.CreateDate, OrderByType.Desc)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
+
+ return (qsItemOqcReqs, totalCount);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
index 3aea949..dd683f6 100644
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -135,14 +135,15 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getPage(queryObj);
+ var (items, totalCount) = new RKJService().getPage(queryObj);
+ var tbBillList =items;
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
--
Gitblit v1.9.3