From fc8149ced60fcf3e91c2012188a814ea0f55d017 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 十月 2024 17:55:02 +0800
Subject: [PATCH] 获取出货信息
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 23 +++++++++++++++++++++++
Tiger.IBusiness.MES/BIZ/IMES_WO.cs | 1 +
Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs | 2 +-
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 30 ++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 993645e..f135d86 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -17,6 +17,7 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
using System.Drawing.Printing;
using System.Net.NetworkInformation;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES
{
@@ -481,5 +482,34 @@
}
return result;
}
+
+ /// <summary>
+ /// 鑾峰彇鍑鸿揣淇℃伅
+ /// </summary>
+ /// <param name="wo"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetShipList(string wo, string orgCode)
+ {
+ var result = new ApiAction();
+ try
+ {
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q=>q.ORG_CODE == orgCode).FirstAsync();
+ if (db.Queryable<mes_ShipList>().Any(q => q.MoDoc.Equals(wo) && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now) && q.Status == 2 && q.Org == org.ID.ToInt64()))
+ {
+ result.Data = "Customer";
+ }
+ else
+ {
+ result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
+ result.Data = "InStore";
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇鍑鸿揣淇℃伅寮傚父");
+ }
+ return result;
+ }
}
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index bf78085..c050994 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -7,6 +7,7 @@
using Tiger.Model.Entitys.MES.BizMesWo;
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Api.iBiz;
+using Newtonsoft.Json;
namespace Tiger.Api.Controllers.MES
{
@@ -182,6 +183,28 @@
}
/// <summary>
+ /// 鑾峰彇鍑鸿揣淇℃伅
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetShipList([FromBody] ApiAction 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));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
/// 鑾峰彇宸ュ崟鎵规鐨勬暟閲忔眹鎬�
/// </summary>
/// <param name="batch"></param>
diff --git a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
index de12899..bc0d5af 100644
--- a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
+++ b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
@@ -21,5 +21,6 @@
public Task<ApiAction> AddOrEditLabelVarByWorkOrder(BAS_LABEL_VAR_WO input);
public Task<ApiAction<QueryAble<BAS_LABEL_VAR_WO>>> GetLabelVarByWorkOrder(BizLabelVarWoInput input);
public Task<ApiAction<LOG_LABEL_PRINT>> GetRePrintInfo(RePrintInput input);
+ public Task<ApiAction> GetShipList(string wo, string orgCode);
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs
index cdff33a..d3cb03e 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs
@@ -41,7 +41,7 @@
/// <summary>
///
/// </summary>
- public DateTime BussinessDate { get; set; } = DateTime.MinValue;
+ public DateTime BusinessDate { get; set; } = DateTime.MinValue;
/// <summary>
///
/// </summary>
--
Gitblit v1.9.3