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/XJService.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index a2db478..a688673 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -133,13 +133,12 @@
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                 "鏈畬鎴�".Equals(queryObj.result),
-                (s, a) => s.FcheckResu == null || s.Fsubmit == null ||
+                (s, a) =>  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)
+                (s, a) => s.Fsubmit == 1)
             .WhereIF(id > 0, (s, a) => s.Id == id)
             .Select((s, a) => new QsQaItemXj
             {
@@ -360,6 +359,15 @@
     {
         var items = xjDto.items;
         var userNo = xjDto.userNo;
+        
+        var db = SqlSugarHelper.GetInstance();
+        db.Deleteable<QsQaItemXj01>()
+            .Where(s => s.Pid == xjDto.gid)
+            .ExecuteCommand();
+        
+        db.Deleteable<QsQaItemXj02>()
+            .Where(s => s.Gid == xjDto.gid)
+            .ExecuteCommand();
 
         SqlSugarHelper.UseTransactionWithOracle(db =>
         {

--
Gitblit v1.9.3