From 38260f9d8bba59567844f19c5ce60576ce04a923 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期一, 22 十二月 2025 15:01:34 +0800
Subject: [PATCH] 取消巡检不合格后自动生成巡检单逻辑
---
StandardPda/MES.Service/service/QC/XJService.cs | 125 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 59 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index 68b0d77..6350a1c 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -89,7 +89,7 @@
Daa001 = a.Daa001,
Daa003 = a.Daa003,
Daa008 = a.Daa008
- }).ToList();
+ }).Distinct().ToList();
}
public List<MesItems> getBoardItem(string lineNo)
@@ -107,7 +107,7 @@
ItemNo = b.ItemNo,
ItemName = b.ItemName,
ItemModel = b.ItemModel
- }).ToList();
+ }).Distinct().ToList();
}
//public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
@@ -176,40 +176,45 @@
var totalCount = 0;
var pageList = db
- .Queryable<QsQaItemXj, Womdaa, MesItems>((s, a, b) =>
+ .Queryable<QsQaItemXj, Womdaa, MesItems, Womcaa, MES_PROJECT>((s, a, b,c,d) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
- JoinType.Left, s.ItemId == b.Id
+ JoinType.Left, s.ItemId == b.Id,
+ JoinType.Left,a.Daa021 == c.Caa001,
+ JoinType.Left ,d.Id == c.Project
)
)
// 猸� 妯＄硦鎼滅储锛圔illNo 鎴� ItemNo 鏂板
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
- (s, a, b) =>
+ (s, a, b,c,d) =>
s.BillNo.Contains(queryObj.SearchValue) ||
- s.ItemNo.Contains(queryObj.SearchValue)
+ s.ItemNo.Contains(queryObj.SearchValue) ||
+ b.ItemName.Contains(queryObj.SearchValue)||
+ a.Daa020.Contains(queryObj.SearchValue)||
+ d.PROJECT_CODE.Contains(queryObj.SearchValue)
)
// 猸� 鐘舵�佺瓫閫夛細鏈畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0
+ (s, a, b,c,d) => s.Fsubmit == null || s.Fsubmit == 0
)
// 猸� 鐘舵�佺瓫閫夛細宸插畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == 1
+ (s, a, b,c,d) => s.Fsubmit == 1
)
// 猸� ID 鏌ヨ锛堝崟鏉★級
- .WhereIF(id > 0, (s, a, b) => s.Id == id)
+ .WhereIF(id > 0, (s, a, b,c,d) => s.Id == id)
// 猸� select 瀹炰綋杩斿洖
- .Select((s, a, b) => new QsQaItemXj
+ .Select((s, a, b,c,d) => new QsQaItemXj
{
Id = s.Id,
ReleaseNo = s.ReleaseNo,
@@ -234,7 +239,9 @@
// 猸� 棰濆瀛楁锛堟潵鑷繛琛級
PlanQty = a.Daa008,
ItemName = b.ItemName,
- ItemModel = b.ItemModel
+ ItemModel = b.ItemModel,
+ DAA020 = a.Daa020,
+ PROJECT_CODE = d.PROJECT_CODE
})
.OrderBy(s => s.CreateDate, OrderByType.Desc)
@@ -412,63 +419,63 @@
SQLHelper.ExecuteNonQuery(sqlUpdate);
}
- var resu1 = dt.Rows[0]["FCHECK_RESU"]?.ToString();
+ // var resu1 = dt.Rows[0]["FCHECK_RESU"]?.ToString();
- var fsubmit2 = resu1 == "鍚堟牸" ? 1 : 0;
+ // var fsubmit2 = resu1 == "鍚堟牸" ? 1 : 0;
- if (fsubmit2 == 0)
- {
- var db = SqlSugarHelper.GetInstance();
+ // if (fsubmit2 == 0)
+ // {
+ // var db = SqlSugarHelper.GetInstance();
- // ===== 杈撳嚭鍙傛暟 =====
- var outFlag = new SugarParameter("P_FLAG", null,
- DbType.Int32, ParameterDirection.Output, 10);
+ // // ===== 杈撳嚭鍙傛暟 =====
+ // var outFlag = new SugarParameter("P_FLAG", null,
+ // DbType.Int32, ParameterDirection.Output, 10);
- var outText = new SugarParameter("P_TEXT", null,
- DbType.String, ParameterDirection.Output, 4000);
+ // var outText = new SugarParameter("P_TEXT", null,
+ // DbType.String, ParameterDirection.Output, 4000);
- // ===== 杈撳叆鍙傛暟 =====
- var parameters = new List<SugarParameter>
- {
- new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
- new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
- new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
- new SugarParameter("P_RELEASE_NO",rkjDto.releaseNo,DbType.String,ParameterDirection.Input),
+ // // ===== 杈撳叆鍙傛暟 =====
+ // var parameters = new List<SugarParameter>
+ //{
+ // new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
+ // new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
+ // new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
+ // new SugarParameter("P_RELEASE_NO",rkjDto.releaseNo,DbType.String,ParameterDirection.Input),
- // 杈撳嚭鍙傛暟蹇呴』甯︿笂
- outFlag,
- outText
- };
- // ===== 鎵ц瀛樺偍杩囩▼ =====
- db.Ado.ExecuteCommand(
- "BEGIN PRC_XJ_GENERATE_two(:P_ID, :P_USER, :P_ISH,:P_RELEASE_NO, :P_FLAG, :P_TEXT); END;",
- parameters);
+ // // 杈撳嚭鍙傛暟蹇呴』甯︿笂
+ // outFlag,
+ // outText
+ //};
+ // // ===== 鎵ц瀛樺偍杩囩▼ =====
+ // db.Ado.ExecuteCommand(
+ // "BEGIN PRC_XJ_GENERATE_two(:P_ID, :P_USER, :P_ISH,:P_RELEASE_NO, :P_FLAG, :P_TEXT); END;",
+ // parameters);
- // ===== 璇诲彇杈撳嚭鍙傛暟骞惰浆鎹㈡垚 ResponseResult =====
- var result = new ResponseResult
- {
- status = outFlag.Value?.ToString() == "1" ? 1 : 0, // 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触
- message = outText.Value?.ToString()
- };
+ // // ===== 璇诲彇杈撳嚭鍙傛暟骞惰浆鎹㈡垚 ResponseResult =====
+ // var result = new ResponseResult
+ // {
+ // status = outFlag.Value?.ToString() == "1" ? 1 : 0, // 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触
+ // message = outText.Value?.ToString()
+ // };
- var useTransactionWithOracle1 =
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj>()
- .SetColumns(s => s.Fsubmit == 1)
- .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
- .SetColumns(s => s.FsubmitDate == DateTime.Now)
- .Where(s => s.Id == rkjDto.gid)
- .ExecuteCommand();
- });
- return new ResponseResult
- {
- status = 0,
- message = "鎻愪氦鎴愬姛",
- data = useTransactionWithOracle1
- };
- }
+ // var useTransactionWithOracle1 =
+ // SqlSugarHelper.UseTransactionWithOracle(db =>
+ // {
+ // return db.Updateable<QsQaItemXj>()
+ // .SetColumns(s => s.Fsubmit == 1)
+ // .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
+ // .SetColumns(s => s.FsubmitDate == DateTime.Now)
+ // .Where(s => s.Id == rkjDto.gid)
+ // .ExecuteCommand();
+ // });
+ // return new ResponseResult
+ // {
+ // status = 0,
+ // message = "鎻愪氦鎴愬姛",
+ // data = useTransactionWithOracle1
+ // };
+ // }
var useTransactionWithOracle =
--
Gitblit v1.9.3