From 5e1220e4b610dfbcde332d9e316eff66ad0bb971 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 01 一月 2025 21:57:44 +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 | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index 2860075..301f42f 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -8,6 +8,7 @@
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Api.iBiz;
using Newtonsoft.Json;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Api.Controllers.MES
{
@@ -226,13 +227,12 @@
/// <returns></returns>
[HttpPost]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetShipList([FromBody] ApiAction action)
+ public async Task<IActionResult> GetShipList([FromBody] ApiAction<ShippingInput> action)
{
ApiAction response = new();
try
{
- var options = JsonConvert.DeserializeObject<AuthOption>(action.Options?.ToString());
- response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetShipList(action.Data?.ToString(), options.OrgCode));
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetShipList(action.Data));
}
catch (System.Exception ex)
{
@@ -264,6 +264,24 @@
return Ok(response);
}
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoNodeBatchCount([FromBody] ApiAction<GetWoNodeBatchCountInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = action.Data.BatchNo, NodeIdOrName=action.Data.NodeName });
+ var dt = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars);
+ response.Data = dt;
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
/// <summary>
/// 鐢熸垚鍏ュ簱鑾峰彇鏉＄爜宸ュ崟淇℃伅鍙婂寘瑁呬俊鎭�
/// </summary>
@@ -284,5 +302,47 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟澶囨枡淇℃伅
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoPickList([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetWoPickList(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> CheckCode([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().CheckCode(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
--
Gitblit v1.9.3