From 799a463b41e84aa265f109035c08892614ea9fd8 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 24 七月 2025 21:12:32 +0800
Subject: [PATCH] 首检排序
---
MES.Service/service/QC/XJService.cs | 118 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 62 insertions(+), 56 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 3fdc709..a2db478 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -1,11 +1,11 @@
锘縰sing System.Data;
-using DnsClient.Protocol;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using DbType = System.Data.DbType;
+
namespace MES.Service.service.QC;
public class XJService
@@ -46,11 +46,10 @@
//in鐨勫啓娉� https://www.donet5.com/Home/Doc?typeId=1187
- return db.Queryable<Womdaa, MesItems>(
- (a, c) =>
- new JoinQueryInfos(
- JoinType.Left, a.Daa002 == c.Id.ToString() ))
- .Where(a => a.Daa001 == daa001 )
+ return db.Queryable<Womdaa, MesItems>((a, c) =>
+ new JoinQueryInfos(
+ JoinType.Left, a.Daa002 == c.Id.ToString()))
+ .Where(a => a.Daa001 == daa001)
.Select((a, c) => new Womdaa
{
Daa001 = a.Daa001,
@@ -73,7 +72,7 @@
return db.Queryable<Womdaa, MesLine>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
- .GroupBy((a, b) => new
+ .GroupBy((a, b) => new
{
a.Daa015, b.LineName
})
@@ -88,12 +87,12 @@
{
var db = SqlSugarHelper.GetInstance();
return db.Queryable<Womdaa>().Where(a =>
- a.Daa015 == daa020 &&
- a.Daa002 == item )
+ a.Daa015 == daa020 &&
+ a.Daa002 == item)
.Select<Womdaa>(a => new Womdaa
{
- Daa001 = a.Daa001,
- // DetailMem = a.DetailMem
+ Daa001 = a.Daa001
+ // DetailMem = a.DetailMem
}).ToList();
}
@@ -103,7 +102,7 @@
return db.Queryable<Womdaa>()
.Where(a =>
a.Daa015 == lineNo)
- .Select<Womdaa>(a =>
+ .Select<Womdaa>(a =>
new Womdaa
{
Daa002 = a.Daa002,
@@ -111,6 +110,7 @@
//DetailMem = a.DetailMem
}).OrderBy(a => a.Daa002).ToList();
}
+
public List<QsQaItemXj> getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -131,11 +131,15 @@
.WhereIF(lineNo != null && lineNo.Length > 0,
(s, a) => lineNo.Contains(a.Daa015))
.WhereIF(
- (StringUtil.IsNotNullOrEmpty(queryObj.result) && "鏈畬鎴�".Equals(queryObj.result)),
- (s, a) => s.FcheckResu == null || s.Fsubmit == null || s.Fsubmit == 0)
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ "鏈畬鎴�".Equals(queryObj.result),
+ (s, a) => s.FcheckResu == null || s.Fsubmit == null ||
+ s.Fsubmit == 0)
.WhereIF(
- (StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result)),
- (s, a) => s.FcheckResu != null && s.Fsubmit != null && s.Fsubmit != 0)
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ !"鏈畬鎴�".Equals(queryObj.result),
+ (s, a) => s.FcheckResu != null && s.Fsubmit != null &&
+ s.Fsubmit != 0)
.WhereIF(id > 0, (s, a) => s.Id == id)
.Select((s, a) => new QsQaItemXj
{
@@ -157,8 +161,8 @@
PlanQty = a.Daa008, // 宸ュ崟鏁伴噺
ItemModel = a.Daa004, // 瑙勬牸
ItemName = a.Daa003, // 浜у搧鍚嶇О
- ItemId = a.Daa002, // 浜у搧鍚嶇О
- // Fsubmit = s.Fsubmit // 鑻ラ渶瑕佽繑鍥� Fsubmit 瀛楁
+ ItemId = a.Daa002 // 浜у搧鍚嶇О
+ // Fsubmit = s.Fsubmit // 鑻ラ渶瑕佽繑鍥� Fsubmit 瀛楁
})
.OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -209,7 +213,7 @@
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
Remarks = s.Remarks,
-
+
PlanQty = a.Daa008,//宸ュ崟鏁伴噺
ItemModel = a.Daa004,//瑙勬牸
ItemName = a.Daa003,//浜у搧鍚嶇О
@@ -225,36 +229,37 @@
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemId == itemId && 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.ItemId == itemId).Select(
- b => new QsQaItemXj01
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- 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,
- QsCode = b.QsCode,
- QsName = b.QsName,
- result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
+ && b.ItemId == itemId).Select(b => new QsQaItemXj01
+ {
+ ProjName = b.ProjName,
+ ItemMod = b.ItemMod,
+ InspectionMethod = b.InspectionMethod,
+ UsingInstruments = b.UsingInstruments,
+ LevelNum = SqlFunc.IsNull(
+ 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,
+ QsCode = b.QsCode,
+ QsName = b.QsName,
+ result = "鏈娴�",
+ isCheck = 0,
+ Picture = b.Picture,
+ Picturename = b.Picturename
+ }).ToList();
}
public List<QsQaItemXj01> getJYItem(decimal? pid, decimal? id)
@@ -461,8 +466,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsQaItemXj01>()
@@ -591,25 +596,27 @@
.ExecuteCommand();
});
}
-
+
public bool XJQaSubmit(QsItem item)
{
var (factory, company) = UserUtil.GetFactory(item.userNo);
try
{
// 瀹氫箟杈撳嚭鍙傛暟
- var outputResult = new SugarParameter("o_Result", null,DbType.Int32, ParameterDirection.Output,
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
4000);
- var outputMessage = new SugarParameter("o_Msg", null,DbType.String,ParameterDirection.Output, 4000);
+ var outputMessage = new SugarParameter("o_Msg", null, DbType.String,
+ ParameterDirection.Output, 4000);
// 瀹氫箟杈撳叆鍙傛暟
var parameters = new List<SugarParameter>
{
-
- new("p_Id", item.gid, DbType.Int32,ParameterDirection.Input),
- new("p_Flag", 1, DbType.Int32,ParameterDirection.Input),
- new("p_User", item.userNo, DbType.String, ParameterDirection.Input),
+ new("p_Id", item.gid, DbType.Int32, ParameterDirection.Input),
+ new("p_Flag", 1, DbType.Int32, ParameterDirection.Input),
+ new("p_User", item.userNo, DbType.String,
+ ParameterDirection.Input),
outputResult,
outputMessage
};
@@ -625,9 +632,9 @@
var resultValue = outputResult.Value?.ToString();
var messageValue = outputMessage.Value?.ToString();
- if ("1".Equals(resultValue)) {throw new Exception(messageValue);}
- if ("0".Equals(resultValue)) {throw new Exception(messageValue);}
-
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+ if ("0".Equals(resultValue)) throw new Exception(messageValue);
+
return true;
}
catch (Exception ex)
@@ -652,5 +659,4 @@
LineName = b.LineName
}).OrderBy("a.Daa015").ToList();
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3