From bdfcb2760a617d0fb95ee934696a3dde477d7e68 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 29 八月 2025 17:56:58 +0800
Subject: [PATCH] 1、获取检验项目前先删除
---
MES.Service/service/QC/SJService.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 5bb9e7f..a51fd57 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -110,6 +110,8 @@
a => a.ItemCj.Contains(queryObj.ItemCj))
.WhereIF(!string.IsNullOrEmpty(queryObj.daa001),
a => a.daa001.Contains(queryObj.daa001))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.Cjr),
+ a => a.Cjr.Contains(queryObj.Cjr))
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -186,7 +188,9 @@
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemId == itemId).Select(b =>
+ .Where(b => b.QsType == "1" && b.ItemId == itemId)
+ .OrderBy(b => b.Xh) // 鎸塜h瀛楁鍗囧簭鎺掑簭
+ .Select(b =>
new QsItemIpiItem
{
ProjName = b.ProjName,
@@ -315,6 +319,16 @@
public QsItem SaveItem(QsItem item)
{
+ var db = SqlSugarHelper.GetInstance();
+ db.Deleteable<QsItemIpiItem>()
+ .Where(s => s.Pid == item.gid)
+ .ExecuteCommand();
+
+ db.Deleteable<QsItemIpiItemDetail>()
+ .Where(s => s.Gid == item.gid)
+ .ExecuteCommand();
+
+
var qsItemIpiItems = item.Items;
SqlSugarHelper.UseTransactionWithOracle(db =>
{
@@ -448,6 +462,7 @@
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
.SetColumns(s => s.StatusUser == detail.CreateBy)
+ .SetColumns(s => s.StatusDate== DateTime.Now)
.SetColumns(s => s.CompleteTime == DateTime.Now)
.Where(s => s.Id == detail.Gid)
.ExecuteCommand();
--
Gitblit v1.9.3