From 90b1732bd159aea424925d2605058c2417a4f412 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 18 七月 2025 14:27:33 +0800
Subject: [PATCH] 替代料品转换
---
StandardPda/MES.Service/service/QC/RKJService.cs | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/RKJService.cs b/StandardPda/MES.Service/service/QC/RKJService.cs
index 20008bb..5cb1599 100644
--- a/StandardPda/MES.Service/service/QC/RKJService.cs
+++ b/StandardPda/MES.Service/service/QC/RKJService.cs
@@ -76,29 +76,28 @@
var qsItemOqcItems = db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "3"
- && b.ItemNo == itemNo).Select(
- b => new QsItemOqcItem
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- Result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
+ && b.ItemNo == itemNo).Select(b => new QsItemOqcItem
+ {
+ ProjName = b.ProjName,
+ ItemMod = b.ItemMod,
+ InspectionMethod = b.InspectionMethod,
+ UsingInstruments = b.UsingInstruments,
+ LevelNum = SqlFunc.IsNull(
+ SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
+ b.InspectionLevel),
+ MaxValue = b.MaxValue,
+ StandardValue = b.StandardValue,
+ MinValue = b.MinValue,
+ Notes = b.Notes,
+ FcheckLevel = b.FcheckLevel,
+ FacLevel = b.FacLevel,
+ QsCode = b.QsCode,
+ QsName = b.QsName,
+ Result = "鏈娴�",
+ isCheck = 0,
+ Picture = b.Picture,
+ Picturename = b.Picturename
+ }).ToList();
qsItemOqcItems.ForEach(item =>
{
@@ -377,8 +376,8 @@
result = 1;
else if (count - passCount < QsItemOqcItem.FreQty) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemOqcItem>()
@@ -443,17 +442,19 @@
private void setBarCodes(string? FcheckResu, QsItemOqcItemDetail detail,
SqlSugarClient db)
{
- var oqcReqList = db.Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>(
- (a, b, c) =>
- new JoinQueryInfos(
- JoinType.Left, a.BillNo == b.BillNo,
- JoinType.Left, c.Daa001 == b.RbillNo
- ))
+ var oqcReqList = db
+ .Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>((a, b, c) =>
+ new JoinQueryInfos(
+ JoinType.Left, a.BillNo == b.BillNo,
+ JoinType.Left, c.Daa001 == b.RbillNo
+ ))
.Where(a => a.Id == detail.Gid)
.Select((a, b, c) =>
new
{
- a.Id, a.BillNo, c.Daa001
+ a.Id,
+ a.BillNo,
+ c.Daa001
})
.ToList();
@@ -587,8 +588,8 @@
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
- RKJDaa001, Womdaa, VLineUser>(
- (a, b, c, ca, m, da, z) => new JoinQueryInfos(
+ RKJDaa001, Womdaa, VLineUser>((a, b, c, ca, m, da, z) =>
+ new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo,
JoinType.Left, a.BillNo == c.BillNo,
JoinType.Left,
@@ -840,12 +841,11 @@
var db = SqlSugarHelper.GetInstance();
return db
.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,
- MesInvItemStocks>(
- (a, b, c, d) => new JoinQueryInfos(
- JoinType.Inner, a.BillNo == b.BillNo,
- JoinType.Inner, b.Id == c.ItemInId,
- JoinType.Inner, c.ItemBarcode == d.ItemBarcode
- ))
+ MesInvItemStocks>((a, b, c, d) => new JoinQueryInfos(
+ JoinType.Inner, a.BillNo == b.BillNo,
+ JoinType.Inner, b.Id == c.ItemInId,
+ JoinType.Inner, c.ItemBarcode == d.ItemBarcode
+ ))
.Where((a, b, c, d) => a.Id == gid)
.Count() > 0;
}
--
Gitblit v1.9.3