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/Modes/MessageCenter.cs | 2 +-
MES.Service/service/QC/XJService.cs | 14 +++++++++++---
MES.Service/service/QC/SJService.cs | 10 ++++++++++
MES.Service/service/QC/RKJService.cs | 14 +++++++++++---
MES.Service/service/WomcaaManager.cs | 7 ++-----
5 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/MES.Service/Modes/MessageCenter.cs b/MES.Service/Modes/MessageCenter.cs
index 637de92..8e0f2c8 100644
--- a/MES.Service/Modes/MessageCenter.cs
+++ b/MES.Service/Modes/MessageCenter.cs
@@ -4,7 +4,7 @@
/// <summary>
/// </summary>
-[SugarTable("MESSAGE_CENTER")]
+[SugarTable("MESSAGE_CENTER1")]
public class MessageCenter
{
/// <summary>
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 =>
{
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index a7942ca..a51fd57 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -319,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 =>
{
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 =>
{
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index bd15c94..dbfeaa8 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -222,11 +222,8 @@
: null, /// 缁勬垚鐢ㄩ噺 */
//Cab009 = dto.FUnitID,/// 鍗曚綅
//2024-11-15 14锛�05 鐢ㄦ枡娓呭崟鍏嬭浆鍗冨厠
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) &&
- int.TryParse(dto.FUnitID, out var unitId)
- ? unitId == 10097
- ? Convert.ToDecimal(dto.FNeedQty) / 1000
- : Convert.ToDecimal(dto.FNeedQty)
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) && int.TryParse(dto.FUnitID, out var unitId) ? unitId == 10097
+ ? Convert.ToDecimal(dto.FNeedQty) / 1000 : Convert.ToDecimal(dto.FNeedQty)
: null,
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) &&
int.TryParse(dto.FUnitID, out var pickedQty)
--
Gitblit v1.9.3