From f34f0751ef0c6305c94ff342ca7fbe24aa09844e Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 18 十二月 2025 14:48:31 +0800
Subject: [PATCH] 111
---
StandardPda/MESApplication/Controllers/QC/SJController.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..492732b 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -1,9 +1,11 @@
-锘縰sing System.Dynamic;
+锘縰sing System.Data;
+using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace MESApplication.Controllers.QC;
@@ -41,14 +43,14 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
+ var (item, totalCount) = new SJService().getPage(queryObj);
+ resultInfos.tbBillList = item;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -319,4 +321,89 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ //IqcQaSubmit
+ [HttpPost("SJQaSubmit")]
+ public ResponseResult SJQaSubmit(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new SJService().SJQaSubmit(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇涓�鑷存�ф牳瀵归」鐩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getYzxItem")]
+ public ResponseResult getYzxItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+ try
+ {
+ var tbBillList = new SJService().getYzxBDlist(id);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tbBillList
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨涓�鑷存�ф牳瀵归」鐩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("saveYzxItem")]
+ public ResponseResult saveYzxItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+ var dataDt = data["data"]?.ToString();
+ var dt = JsonConvert.DeserializeObject<DataTable>(dataDt);
+ try
+ {
+ if (!dt.Columns.Contains("id"))
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇峰厛閫夋嫨鏁版嵁鍐嶄繚瀛橈紒",
+ data = "璇峰厛閫夋嫨鏁版嵁鍐嶄繚瀛橈紒"
+ };
+ new SJService().saveYzxBDlist(id, dt);
+ var msg = new SJService().YzxImgVerify(id);
+
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = ""
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3