From 5e11da1d662cd0c629ab2d854de2e5babb399ca3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期日, 22 九月 2024 09:14:51 +0800
Subject: [PATCH] 来料检验的分页
---
MES.Service/service/QC/RKJService.cs | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 8656f8a..b77c146 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -132,6 +132,8 @@
break;
}
+ if (string.IsNullOrEmpty(LEV)) throw new Exception("妫�楠屾按骞崇淮鎶ょ殑涓嶆纭�");
+
var sql =
"SELECT " + LEV +
" FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
@@ -140,9 +142,13 @@
var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
+ if (string.IsNullOrEmpty(maxBillNo))
+ throw new Exception("娌℃湁" + quantity + "杩欎釜鑼冨洿鐨勬娊鏍峰熀鍑�");
var result = ExtractSubstring(item.FacLevel, '(', ')');
+ if (string.IsNullOrEmpty(result))
+ throw new Exception("缁存姢鐨勬帴鏀舵按骞充笉姝ｇ‘锛屽簲璇ユ槸0.010---(AQL_0_0010)鍍忚繖鏍风殑");
sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
" Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
@@ -402,9 +408,9 @@
.ExecuteCommand();
});
- if (FcheckResu.Equals("涓嶅悎鏍�"))
- //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
- saveDetect02(detail.Gid, detail.CreateBy);
+ // if (FcheckResu.Equals("涓嶅悎鏍�"))
+ // //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
+ // saveDetect02(detail.Gid, detail.CreateBy);
return useTransactionWithOracle;
}
@@ -454,24 +460,37 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(
+ XJPageResult queryObj)
{
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,
+ var totalCount = 0;
+
+ 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 +502,18 @@
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,
+ ItemInId = m.ItemInId,
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);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
@@ -558,6 +576,8 @@
public int UpdateQSItemDetail(QsItemOqcItemDetail detail)
{
+ if (isRk(detail.ItemInId)) throw new Exception("宸叉湁鏉＄爜鍏ュ簱锛屼笉鍏佽淇敼妫�楠岀粨鏋�");
+
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemOqcItemDetail>()
@@ -578,6 +598,14 @@
return withOracle;
}
+ //淇敼缁撴灉鍓嶉獙璇佹槸鍚﹀叆搴�
+ private bool isRk(decimal? ItemInId)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesInvItemInCDetails>()
+ .Where(s => s.ItemInId == ItemInId).Count() > 0;
+ }
+
//涓昏〃淇敼澶囨敞瀛楁
public int saveRemarksGid(RKJDto dto)
--
Gitblit v1.9.3