From fba48d2d676cd9b6d493163aef9d87f6e5090aee Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期五, 12 九月 2025 19:02:00 +0800
Subject: [PATCH] 出库检和退货检验
---
MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
index bae9488..552608c 100644
--- a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
+++ b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
@@ -58,6 +58,54 @@
}
}
+<<<<<<< HEAD
+ [HttpPost("SetQSItems")]
+ public ResponseResult SetQSItems([FromBody] JObject data)
+ {
+ var itemNo = data["itemNo"].ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var detail021 = m.SetQSItems(itemNo);
+ resultInfos.tbBillList = detail021;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveItem")]
+ public ResponseResult SaveItem([FromBody] JObject data)
+ {
+ var releaseNo = data["releaseNo"].ToString();
+ var items = data["items"].ToObject<List<QsItemIpiItem>>();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var detail021 = m.SaveItem(releaseNo, items);
+ resultInfos.tbBillList = detail021;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+=======
+>>>>>>> 3b90e8717befe39af4d9384252d27b7a768a773f
//IqcQaSubmit
[HttpPost("IqcQaSubmit")]
public ResponseResult IqcQaSubmit(LLJDto rkjDto)
--
Gitblit v1.9.3