Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.IBusiness.MES/BIZ/IMES_WO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/MES/YadaU9/mes_ShipList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; } } } 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> 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); } } 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>