From 7a783a92137f59a02041d71dcdc8bca7e5a3a0b4 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 30 十月 2025 12:11:12 +0800
Subject: [PATCH] 优化首检巡检生成检验

---
 MES.Service/service/QC/SJService.cs |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index e10516d..48017cf 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -16,6 +16,7 @@
 using System;
 using System.Security.Cryptography;
 using SqlSugar.Extensions;
+using Masuit.Tools.Reflection;
 
 namespace MES.Service.service.QC;
 
@@ -115,7 +116,8 @@
                 Daa008 = a.Daa008,
                 LineName = a.LineName,
                 SaleOrder = ca.Caa015,
-                DepartName = d.Departmentname
+                DepartName = d.Departmentname,
+                PlanName = a.PlanName
             })
             .OrderBy(a => a.CreateTime, OrderByType.Desc);
         var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
@@ -320,17 +322,33 @@
             .Where(s => s.Gid == item.gid)
             .ExecuteCommand();
 
+
         var qsItemIpiItems = item.Items;
         SqlSugarHelper.UseTransactionWithOracle(
             db =>
             {
+                // 1. 璁剧疆鐖剁骇ID
                 qsItemIpiItems.ForEach(s => s.Pid = item.gid);
-                return db.Insertable(qsItemIpiItems).ExecuteCommand();
+
+                // 2. 鎻掑叆
+                db.Insertable(qsItemIpiItems).ExecuteCommand();
+
+                // 3. 閲嶆柊浠庢暟鎹簱鏌ヨ鎻掑叆鍚庣殑璁板綍锛堟寜 pid 鏌ヨ锛� 闃叉妫�楠岀粨鏋滄洿鏂板埌鏃ч」鐩笂
+                qsItemIpiItems = db.Queryable<QsItemIpiItem>()
+                                    .Where(x => x.Pid == item.gid)
+                                    .ToList();
+
+                // 鉁� 杩斿洖鍊间笉閲嶈锛屽彧瑕佷繚璇佷簨鍔℃彁浜ゅ嵆鍙�
+                return 1;
             });
+
+
+
+
         //item.Items = getQSItems(item.gid, null);
 
         //娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
-        item.Items.ForEach(s =>
+        qsItemIpiItems.ForEach(s =>
         {
             if (s.MaxValue != null || s.StandardValue != null || s.MinValue != null)
             {
@@ -351,7 +369,19 @@
         return item;
     }
 
-    public List<string?> GetItemProj(string? itemNo)
+    public decimal SavePlan(decimal pid,string PlanName)
+    {
+        var db = SqlSugarHelper.GetInstance();
+        var res = db.Updateable<QsItemIpiReq>()
+                          .SetColumns(a => a.QaPlan == PlanName)
+                          .Where(a => a.Id == pid)
+                          .ExecuteCommand();
+
+        return res;
+
+    }
+
+        public List<string?> GetItemProj(string? itemNo)
     { //鑾峰彇鐗╂枡鎵�鏈夌殑妫�楠岃鍒掑悕绉�
 
         var db = SqlSugarHelper.GetInstance();

--
Gitblit v1.9.3