From a5019b475f8620dba3b495da983f4db9e32f7ca8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 10 七月 2025 08:18:36 +0800
Subject: [PATCH] AOI

---
 MES.Service/service/QC/SJService.cs |   81 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index db188ef..b83cc8e 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,8 +1,11 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Buffers;
+using System.Data;
+using MES.Service.DB;
 using MES.Service.Dto.service;
 using MES.Service.Modes;
 using MES.Service.util;
 using SqlSugar;
+using DbType = System.Data.DbType;
 
 namespace MES.Service.service.QC;
 
@@ -15,9 +18,7 @@
     {
         var db = SqlSugarHelper.GetInstance();
         var date = DateTime.Now.ToString("yyyy-MM-dd");
-        var sql =
-            "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" +
-            date + "'";
+        var sql = "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" + date + "'";
 
         var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
 
@@ -34,9 +35,11 @@
     }
 
     //鑾峰彇鎵�鏈夋暟鎹垎椤�
-    public List<SJPageResult> getPage(SJPageResult queryObj)
+    public (List<SJPageResult> items, int TotalCount) getPage(SJPageResult queryObj)
     {
         var db = SqlSugarHelper.GetInstance();
+
+        var totalCount = 0;
 
         string[]? lineNo = null;
 
@@ -57,10 +60,13 @@
                 StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                 !"鏈畬鎴�".Equals(queryObj.Result),
                 a => a.Result != "鏈畬鎴�")
+            .WhereIF(queryObj.Comments != null, a => a.Comments == queryObj.Comments)
+            .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),a=>a.BillNo.Contains(queryObj.SearchValue)
+             ||  a.ItemNo.Contains(queryObj.SearchValue))
             .OrderBy(a => a.BillNo, OrderByType.Desc)
-            .ToPageList(queryObj.PageIndex, queryObj.Limit);
+            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
-        return data;
+        return (data, totalCount);
     }
 
 
@@ -222,8 +228,8 @@
 
         item.Items = getQSItems(qsItemIpiReq.Id, null);
         var sjPageResult = new SJPageResult
-            { Id = item.From.Id, Limit = 1, PageIndex = 1 };
-        item.Result = getPage(sjPageResult)[0];
+        { Id = item.From.Id, Limit = 1, PageIndex = 1 };
+        item.Result = getPage(sjPageResult).items[0];
 
         return item;
     }
@@ -409,6 +415,19 @@
         });
     }
 
+    //涓昏〃淇敼澶囨敞瀛楁1
+    public int saveCommentGid(QsItem dto)
+    {
+        return SqlSugarHelper.UseTransactionWithOracle(db =>
+        {
+            return db.Updateable<QsItemIpiReq>()
+                .SetColumns(it =>
+                    it.Comments == dto.Comments) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+                .Where(it => it.Id == dto.gid)
+                .ExecuteCommand();
+        });
+    }
+
     //瀛愯〃淇敼澶囨敞瀛楁
     public int saveRemarksPid(QsItem dto)
     {
@@ -455,4 +474,48 @@
 
         return withOracle;
     }
+
+    public bool SJQaSubmit(QsItem item)
+    {
+        var (factory, company) = UserUtil.GetFactory(item.userNo);
+        try
+        {
+            // 瀹氫箟杈撳嚭鍙傛暟
+            var outputResult = new SugarParameter("o_Result", null, DbType.Int32, ParameterDirection.Output,
+                4000);
+
+            var outputMessage = new SugarParameter("o_Msg", null, DbType.String, ParameterDirection.Output, 4000);
+
+            // 瀹氫箟杈撳叆鍙傛暟
+            var parameters = new List<SugarParameter>
+         {
+
+             new("p_Id", item.gid, DbType.Int32,ParameterDirection.Input),
+             new("p_Flag", 1, DbType.Int32,ParameterDirection.Input),
+             new("p_User", item.userNo, DbType.String, ParameterDirection.Input),
+             outputResult,
+             outputMessage
+         };
+
+            var db = SqlSugarHelper.GetInstance();
+
+            // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+            db.Ado.ExecuteCommand(
+                "BEGIN PRC_WOMDAA_SJ_UPDATE_RES(:p_Id,:p_Flag,:p_User,:o_Result, :o_Msg); END;",
+                parameters.ToArray());
+
+            // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+            var resultValue = outputResult.Value?.ToString();
+            var messageValue = outputMessage.Value?.ToString();
+
+            if ("1".Equals(resultValue)) { throw new Exception(messageValue); }
+            if ("0".Equals(resultValue)) { throw new Exception(messageValue); }
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            throw new Exception(ex.Message);
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3