From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MESApplication/Controllers/QC/LljController.cs | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/MESApplication/Controllers/QC/LljController.cs b/MESApplication/Controllers/QC/LljController.cs
index e14f96f..529ba55 100644
--- a/MESApplication/Controllers/QC/LljController.cs
+++ b/MESApplication/Controllers/QC/LljController.cs
@@ -10,23 +10,23 @@
[Route("api/[controller]")]
[ApiController]
-public class LljController: ControllerBase
+public class LljController : ControllerBase
{
-
[HttpPost("getPage")]
public ResponseResult getPage([FromBody] XJPageResult queryObj)
{
try
{
dynamic resultInfos = new ExpandoObject();
+ var (item, totalCount) = new LljService().GetPage(queryObj);
var tbBillList =
- new LljService().GetPage(queryObj);
- resultInfos.tbBillList = tbBillList;
+ resultInfos.tbBillList = item;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -34,7 +34,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("setJYItem")]
public ResponseResult setJYItem([FromBody] JObject data)
@@ -46,7 +46,7 @@
{
dynamic resultInfos = new ExpandoObject();
var tbBillList =
- new LljService().SetItems(itemNo, quantity,releaseNo);
+ new LljService().SetItems(itemNo, quantity, releaseNo);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
@@ -60,7 +60,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("saveItem")]
public ResponseResult saveItem([FromBody] LLJDto lljDto)
{
@@ -82,12 +82,12 @@
return ResponseResult.ResponseError(ex);
}
}
+
//getItems
[HttpPost("getJYItem")]
public ResponseResult getJYItem([FromBody] JObject data)
{
-
- var id = data["id"]?.ToString();
+ var id = data["id"]?.ToString();
var releaseNo = data["releaseNo"]?.ToString();
try
{
@@ -108,7 +108,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
//getXjDetail02ById
[HttpPost("getXjDetail02ById")]
public ResponseResult getXjDetail02ById([FromBody] JObject data)
@@ -134,9 +134,10 @@
}
}
-
+
[HttpPost("SetQSItemDetail")]
- public ResponseResult SetQSItemDetail([FromBody] MesQaItemsDetectDetail12 detail)
+ public ResponseResult SetQSItemDetail(
+ [FromBody] MesQaItemsDetectDetail12 detail)
{
try
{
@@ -156,7 +157,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("UpdateQSItemDetail")]
public ResponseResult UpdateQSItemDetail(
[FromBody] MesQaItemsDetectDetail12 detail)
@@ -179,7 +180,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
//saveRemarksGid 涓昏〃娣诲姞涓嶅悎鏍兼弿杩�
[HttpPost("saveRemarksGid")]
public ResponseResult saveRemarksGid([FromBody] LLJDto rkjDto)
@@ -202,6 +203,7 @@
return ResponseResult.ResponseError(ex);
}
}
+
//saveRemarksPid 瀛愯〃娣诲姞涓嶅悎鏍兼弿杩�
[HttpPost("saveRemarksPid")]
public ResponseResult saveRemarksPid([FromBody] LLJDto rkjDto)
@@ -224,7 +226,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
//removeXJ 鍒犻櫎
[HttpPost("removeXJ")]
public ResponseResult removeXJ([FromBody] JObject data)
@@ -249,4 +251,26 @@
}
}
+ //IqcQaSubmit
+ [HttpPost("IqcQaSubmit")]
+ public ResponseResult IqcQaSubmit(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new LljService().IqcQaSubmit(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3