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/RKJService.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 6b2892e..fdf43a1 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -478,13 +478,12 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu == null || a.Fsubmit == null ||
+ (a, b) => a.Fsubmit == null ||
a.Fsubmit == 0)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu != null && a.Fsubmit != null &&
- a.Fsubmit != 0)
+ (a, b) => a.Fsubmit == 1)
.WhereIF(id > 0, (a, b) => a.Id == id)
.WhereIF(!string.IsNullOrEmpty(queryObj.itemCj),
(a, b) => b.itemCj.Contains(queryObj.itemCj))
@@ -788,6 +787,15 @@
{
var items = rkjDto.items;
var userNo = rkjDto.userNo;
+
+ var db = SqlSugarHelper.GetInstance();
+ db.Deleteable<QsItemOqcItem>()
+ .Where(s => s.Pid == rkjDto.gid)
+ .ExecuteCommand();
+
+ db.Deleteable<QsItemOqcItemDetail>()
+ .Where(s => s.Gid == rkjDto.gid)
+ .ExecuteCommand();
SqlSugarHelper.UseTransactionWithOracle(db =>
{
--
Gitblit v1.9.3