From 27bd7530f8c1334b9338dea64002164bd74de8ac Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 30 五月 2025 14:50:25 +0800
Subject: [PATCH] 入库检验的逻辑修改
---
MES.Service/Dto/service/RKJDto.cs | 2 +-
MES.Service/service/QC/RKJService.cs | 15 ++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/MES.Service/Dto/service/RKJDto.cs b/MES.Service/Dto/service/RKJDto.cs
index cab909f..bd1713e 100644
--- a/MES.Service/Dto/service/RKJDto.cs
+++ b/MES.Service/Dto/service/RKJDto.cs
@@ -7,7 +7,7 @@
public string? userNo { get; set; }
//涓昏〃id
- public int? gid { get; set; }
+ public decimal? gid { get; set; }
//瀛愯〃id
public int? pid { get; set; }
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 672dad7..457fdbe 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -59,6 +59,10 @@
public List<RkDaa002> GetDaa001s(string lineNo)
{
var db = SqlSugarHelper.GetInstance();
+ // return db.Queryable<RKJDaa001>()
+ // .Where(t => t.LineNo == lineNo)
+ // .OrderBy(t => t.BillNo, OrderByType.Desc)
+ // .ToList();
return null;
}
@@ -228,11 +232,16 @@
{
var commit = 0;
- xj.CreateBy = userNo;
- xj.CreateDate = DateTime.Now;
+ // xj.CreateBy = userNo;
+ // xj.CreateDate = DateTime.Now;
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
+ var qsItemOqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s=>s.Id == xj.Id)
+ .First();
+ decimal? pid = 0;
+ pid = qsItemOqcReq == null ? db.Insertable(xj).ExecuteReturnIdentity() : qsItemOqcReq.Id;
+
xj.Id = pid;
rkjDto.gid = pid;
--
Gitblit v1.9.3