From a65e9ae75629e1d87d6f373f9bdcfac32ccf1fea Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 17 九月 2025 13:14:16 +0800
Subject: [PATCH] SJ,XJ,RKJ

---
 MESApplication/Controllers/QC/SJController.cs |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..732a88b 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -41,14 +41,15 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            var tbBillList =
-                new SJService().getPage(queryObj);
+            var service = new SJService();
+            var (tbBillList, totalCount) = service.getPageWithTotal(queryObj);
             resultInfos.tbBillList = tbBillList;
             return new ResponseResult
             {
                 status = 0,
                 message = "OK",
-                data = resultInfos
+                data = resultInfos,
+                TotalCount = totalCount
             };
         }
         catch (Exception ex)
@@ -319,4 +320,52 @@
             return ResponseResult.ResponseError(ex);
         }
     }
+
+    [HttpPost("SJQaSubmit")]
+    public ResponseResult SJQaSubmit([FromBody] JObject data)
+    {
+        var userNo = data["userNo"]?.ToString();
+        var id = Convert.ToDecimal(data["id"]?.ToString());
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            var tbBillList = new SJService().SJQaSubmit(userNo, id);
+            resultInfos.tbBillList = tbBillList;
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    [HttpPost("GenUpdateSJ")]
+    public ResponseResult GenUpdateSJ([FromBody] JObject data)
+    {
+        var id = Convert.ToDecimal(data["id"]?.ToString());
+        var no = data["no"]?.ToString();
+        var userNo = data["userNo"]?.ToString();
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            var service = new SJService();
+            var (code, msg) = service.GenUpdateSJ(id, no, userNo);
+            resultInfos.tbBillList = new { result = code, message = msg };
+            return new ResponseResult
+            {
+                status = code,
+                message = msg,
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3