From 57e1796bf33346c3992edde1a63f635cfae0def9 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 22 十一月 2024 01:33:14 +0800
Subject: [PATCH] 获取出货状态更新，获取工序过站数据
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 134 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 9 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..ee7bd5c 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -7,6 +7,8 @@
using Tiger.Model.Entitys.MES.BizMesWo;
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Api.iBiz;
+using Newtonsoft.Json;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Api.Controllers.MES
{
@@ -119,6 +121,27 @@
}
/// <summary>
+ /// 浠庡伐鍗曚腑瑙ｇ粦姝ｅ湪鐢熶骇鐨勬潯鐮�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> UnbindWipSnFromWO([FromBody] ApiAction<UnbindWipSnInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().UnbindWipSnFromWO(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
/// 鏇存柊宸ュ崟妯℃澘鍙橀噺
/// </summary>
/// <param name="action"></param>
@@ -160,25 +183,118 @@
return Ok(response);
}
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SavePrintLabelInAct([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().SavePrintLabelInAct(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> GetRePrintInfo([FromBody] ApiAction<RePrintInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ 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="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetShipList([FromBody] ApiAction<ShippingInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetShipList(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
/// <summary>
/// 鑾峰彇宸ュ崟鎵规鐨勬暟閲忔眹鎬�
/// </summary>
/// <param name="batch"></param>
/// <returns></returns>
- [HttpGet]
+ [HttpPost]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetWoBatchCount(ApiAction action)
+ public async Task<IActionResult> GetWoBatchCount([FromBody] ApiAction 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());
+ 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)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ 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>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetErpProdInBth([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetErpProdInBth(action.Data?.ToString()));
}
catch (System.Exception ex)
{
--
Gitblit v1.9.3