From 4e7803e64656655103a96c4e426bf1bf2563e3f7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 十月 2024 11:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index 80e135c..bf78085 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -161,24 +161,41 @@
}
/// <summary>
- /// 鑾峰彇宸ュ崟鎵规鐨勬暟閲忔眹鎬�
+ /// 鑾峰彇閲嶆墦鏍囩淇℃伅
/// </summary>
- /// <param name="batch"></param>
+ /// <param name="action"></param>
/// <returns></returns>
- [HttpGet]
+ [HttpPost]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetWoBatchCount(ApiAction action)
+ public async Task<IActionResult> GetRePrintInfo([FromBody] ApiAction<RePrintInput> action)
{
ApiAction response = new();
try
{
- SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = action.Data?.ToString(), ERR_CODE = 0, ERR_MSG = "" });
- pars[1].Direction = System.Data.ParameterDirection.Output;
- pars[2].Direction = System.Data.ParameterDirection.Output;
- Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_GET_WO_BATCH_COUNT", pars);
- response.Data = pars[1].Value;
- response.IsSuccessed = pars[1].Value.ToInt32() == 0 ? true : false;
- response.LocaleMsg = new(pars[2].Value.ToString());
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetRePrintInfo(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟鎵规鐨勬暟閲忔眹鎬�
+ /// </summary>
+ /// <param name="batch"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoBatchCount([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = action.Data?.ToString()});
+ var dt = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_WO_BATCH_COUNT", pars);
+ response.Data = dt;
}
catch (System.Exception ex)
{
--
Gitblit v1.9.3