From f6598be8fdb51673c0a48ddeac8bd0e622835b35 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 16 七月 2025 11:58:10 +0800
Subject: [PATCH] 111
---
MES.Service/service/QC/SJService.cs | 115 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index cb6942e..5bb9e7f 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -53,13 +53,16 @@
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
a => a.BillNo == queryObj.BillNo)
.WhereIF(
- (StringUtil.IsNotNullOrEmpty(queryObj.Result) && "鏈畬鎴�".Equals(queryObj.Result)) ||
- (queryObj.Fsubmit != null && (queryObj.Fsubmit == 0 || queryObj.Fsubmit == null)),
- a => a.Result == "鏈畬鎴�" || (a.Fsubmit != null && (a.Fsubmit == 0)) || a.Fsubmit == null)
+ (StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ "鏈畬鎴�".Equals(queryObj.Result)) ||
+ (queryObj.Fsubmit != null &&
+ (queryObj.Fsubmit == 0 || queryObj.Fsubmit == null)),
+ a => a.Result == "鏈畬鎴�" ||
+ (a.Fsubmit != null && a.Fsubmit == 0) || a.Fsubmit == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�" && (a.Fsubmit != null && a.Fsubmit != 0))
+ a => a.Result != "鏈畬鎴�" && a.Fsubmit != null && a.Fsubmit != 0)
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.ItemCj),
a => a.ItemCj == queryObj.ItemCj)
.OrderBy(a => a.BillNo, OrderByType.Desc)
@@ -83,21 +86,30 @@
.WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
// .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo), a => a.BillNo == queryObj.BillNo)
.WhereIF(
- (StringUtil.IsNotNullOrEmpty(queryObj.Result) && "鏈畬鎴�".Equals(queryObj.Result)) ||
- (queryObj.Fsubmit != null && (queryObj.Fsubmit == 0 || queryObj.Fsubmit == null)),
- a => a.Result == "鏈畬鎴�" || (a.Fsubmit != null && (a.Fsubmit == 0)) || a.Fsubmit == null)
+ (StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ "鏈畬鎴�".Equals(queryObj.Result)) ||
+ (queryObj.Fsubmit != null &&
+ (queryObj.Fsubmit == 0 || queryObj.Fsubmit == null)),
+ a => a.Result == "鏈畬鎴�" ||
+ (a.Fsubmit != null && a.Fsubmit == 0) || a.Fsubmit == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- !"鏈畬鎴�".Equals(queryObj.Result), a => a.Result != "鏈畬鎴�" && (a.Fsubmit != null && a.Fsubmit != 0))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemNo), (a) => a.ItemNo.Contains(queryObj.ItemNo))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemModel), (a) => a.ItemModel.Contains(queryObj.ItemModel))
- .WhereIF(!string.IsNullOrEmpty(queryObj.SongJ), (a) => a.SongJ.Contains(queryObj.SongJ))
- .WhereIF(!string.IsNullOrEmpty(queryObj.BillNo), (a) => a.BillNo.Contains(queryObj.BillNo))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemName), (a) => a.ItemName.Contains(queryObj.ItemName))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemCj), (a) => a.ItemCj.Contains(queryObj.ItemCj))
- .WhereIF(!string.IsNullOrEmpty(queryObj.daa001), (a) => a.daa001.Contains(queryObj.daa001))
-
-
+ !"鏈畬鎴�".Equals(queryObj.Result),
+ a => a.Result != "鏈畬鎴�" && a.Fsubmit != null && a.Fsubmit != 0)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemNo),
+ a => a.ItemNo.Contains(queryObj.ItemNo))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemModel),
+ a => a.ItemModel.Contains(queryObj.ItemModel))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SongJ),
+ a => a.SongJ.Contains(queryObj.SongJ))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.BillNo),
+ a => a.BillNo.Contains(queryObj.BillNo))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemName),
+ a => a.ItemName.Contains(queryObj.ItemName))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemCj),
+ a => a.ItemCj.Contains(queryObj.ItemCj))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.daa001),
+ a => a.daa001.Contains(queryObj.daa001))
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -168,21 +180,23 @@
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
- && s.ItemId == itemId && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsItemIpiItem>();
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemId == itemId).Select(
- b => new QsItemIpiItem
+ .Where(b => b.QsType == "1" && b.ItemId == itemId).Select(b =>
+ new QsItemIpiItem
{
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),
+ 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),
@@ -260,21 +274,20 @@
{
var qsItemIpiReq = item.From;
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiReq.StatusDate = DateTime.Now;
- var pid = db.Insertable(qsItemIpiReq)
- .ExecuteReturnIdentity();
- qsItemIpiReq.Id = pid;
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiReq.StatusDate = DateTime.Now;
+ var pid = db.Insertable(qsItemIpiReq)
+ .ExecuteReturnIdentity();
+ qsItemIpiReq.Id = pid;
- item.gid = pid;
+ item.gid = pid;
- qsItemIpiItems.ForEach(s => s.Pid = pid);
+ qsItemIpiItems.ForEach(s => s.Pid = pid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(qsItemIpiReq.Id, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -303,14 +316,13 @@
public QsItem SaveItem(QsItem item)
{
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiItems.ForEach(s => s.Pid = item.gid);
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiItems.ForEach(s => s.Pid = item.gid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(item.gid, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -394,8 +406,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemIpiItem>()
@@ -430,8 +442,8 @@
//鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
if (icount == passCount) result = 1;
- useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ useTransactionWithOracle +=
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
@@ -534,15 +546,18 @@
try
{
// 瀹氫箟杈撳嚭鍙傛暟
- 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 outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, 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_User", item.userNo, DbType.String,
+ ParameterDirection.Input),
outputResult,
outputMessage
};
@@ -559,17 +574,15 @@
var messageValue = outputMessage.Value?.ToString();
if ("1".Equals(resultValue))
- {
// 澶勭悊澶辫触鎯呭喌锛岃繑鍥為敊璇俊鎭�
throw new Exception($"鎿嶄綔澶辫触: {messageValue}");
- }
// 褰� resultValue 涓� "0" 鏃惰繑鍥炴垚鍔熺姸鎬�
return true;
}
catch (Exception ex)
{
- // 閲嶆柊鎶涘嚭鏇村弸濂界殑寮傚父淇℃伅
+ // 閲嶆柊鎶涘嚭鏇村弸濂界殑寮傚父淇℃伅
throw new Exception($"鎻愪氦璐ㄩ噺妫�楠屾暟鎹椂鍙戠敓閿欒: {ex.Message}", ex);
}
}
@@ -583,7 +596,7 @@
.GroupBy(d => new { d.Departmentname })
.Select(d => new SysDepartment
{
- Departmentname = d.Departmentname,
+ Departmentname = d.Departmentname
// 鍏朵粬闇�瑕佺殑瀛楁
})
.OrderBy("DEPARTMENTNAME")
--
Gitblit v1.9.3