From 25fde6086c76f0bcc2848305f90432a3716a5c61 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 25 八月 2025 11:13:51 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MESApplication/Controllers/QC/XJController.cs | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/XJController.cs b/StandardPda/MESApplication/Controllers/QC/XJController.cs
index ef25d6b..df1f09e 100644
--- a/StandardPda/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/XJController.cs
@@ -1,10 +1,12 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing 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;
+using System.Data;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
@@ -159,6 +161,28 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ [HttpPost("XJQaSubmit")]
+ public ResponseResult XJQaSubmit(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new XJService().XJQaSubmit(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
//setJYItem
[HttpPost("setJYItem")]
@@ -236,14 +260,15 @@
try
{
dynamic resultInfos = new ExpandoObject();
+ var (item, totalCount) = new XJService().getPage(queryObj);
var tbBillList =
- new XJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
+ resultInfos.tbBillList = item;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -442,4 +467,68 @@
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 XJService().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 XJService().saveYzxBDlist(id, dt);
+ var msg = new XJService().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