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 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
index e4a9ccf..552608c 100644
--- a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
+++ b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
@@ -58,6 +58,7 @@
}
}
+<<<<<<< HEAD
[HttpPost("SetQSItems")]
public ResponseResult SetQSItems([FromBody] JObject data)
{
@@ -103,6 +104,8 @@
}
}
+=======
+>>>>>>> 3b90e8717befe39af4d9384252d27b7a768a773f
//IqcQaSubmit
[HttpPost("IqcQaSubmit")]
public ResponseResult IqcQaSubmit(LLJDto rkjDto)
--
Gitblit v1.9.3