From 10b5c73c96686534ea3258b838921ad71981feba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com>
Date: Mon, 31 Mar 2025 16:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/product/ProReportworkController.cs    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProReportworkController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProReportworkController.cs
index fc9074d..84ef466 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProReportworkController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProReportworkController.cs
@@ -223,5 +223,34 @@ namespace DOAN.Admin.WebApi.Controllers
             var response = _ProReportworkService.ManualGenerationOfReportWork(workorder, HttpContext.GetName());
             return SUCCESS(response);
         }
-    }
+
+	    /// <summary>
+        /// 批量成品入库
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+		[HttpGet("batchPutInFinProduct")]
+        [AllowAnonymous]
+		public IActionResult batchPutInFinProduct([FromQuery] DateTime startTime,DateTime endTime)
+		{
+            var response = _ProReportworkService.batchPutInFinProduct(startTime,endTime);
+			return SUCCESS(response);
+		}
+
+		
+        /// <summary>
+        /// 单条成品入库或驳回
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+		[HttpGet("putInAndReject")]
+		[AllowAnonymous]
+		public IActionResult putInAndReject([FromQuery] string Id,int type)
+		{
+			var response = _ProReportworkService.putInAndReject(Id, type);
+			return SUCCESS(response);
+		}
+	}
 }
\ No newline at end of file