From 049c1891f1dcede1fe81320992e61c34f661898b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 21 九月 2024 18:33:47 +0800
Subject: [PATCH] 成品入库检调整，消息中心的后台重写
---
MES.Service/service/QC/RKJService.cs | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 3f2b5b6..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,11 +460,12 @@
}
- public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(
+ XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
-
- int totalCount = 0;
+
+ var totalCount = 0;
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
@@ -498,12 +505,13 @@
ItemName = b.ItemName,
ItemModel = b.ItemModel,
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,ref totalCount);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
return (qsItemOqcReqs, totalCount);
}
@@ -568,6 +576,8 @@
public int UpdateQSItemDetail(QsItemOqcItemDetail detail)
{
+ if (isRk(detail.ItemInId)) throw new Exception("宸叉湁鏉＄爜鍏ュ簱锛屼笉鍏佽淇敼妫�楠岀粨鏋�");
+
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemOqcItemDetail>()
@@ -588,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