From 5adecb7ffd986930d2f4e195c0273e4db73b5315 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 07 二月 2025 18:36:51 +0800
Subject: [PATCH] 优化首检
---
MES.Service/service/QC/XJService.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 7514fbc..9acfaa9 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -159,26 +159,26 @@
PlanQty = a.Daa008,//宸ュ崟鏁伴噺
ItemModel = a.Daa004,//瑙勬牸
- ItemName = a.Daa003//浜у搧鍚嶇О
-
+ ItemName = a.Daa003,//浜у搧鍚嶇О
+ ItemId = a.Daa002//浜у搧鍚嶇О
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
- public List<QsQaItemXj01> setJYItem(string itemNo)
+ public List<QsQaItemXj01> setJYItem(decimal itemId)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsQaItemXj01>();
return db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "2"
- && b.ItemNo == itemNo).Select(
+ && b.ItemId == itemId).Select(
b => new QsQaItemXj01
{
ProjName = b.ProjName,
@@ -186,11 +186,11 @@
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,
+ SqlFunc.IsNull( Convert.ToDecimal(b.LevelNum) * Convert.ToDecimal(b.InspectionLevel) , 1),
+ Convert.ToDecimal(b.InspectionLevel)),
+ MaxValue = Convert.ToDecimal(b.MaxValue),
+ StandardValue = Convert.ToDecimal(b.StandardValue),
+ MinValue = Convert.ToDecimal(b.MinValue),
Notes = b.Notes,
FcheckLevel = b.FcheckLevel,
FacLevel = b.FacLevel,
--
Gitblit v1.9.3