From 080741e0b917dc382ecba31c4b19fca1aa772bfd Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期二, 15 四月 2025 17:43:13 +0800 Subject: [PATCH] 增加上架单据信息 --- Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 42 insertions(+), 3 deletions(-) diff --git a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs index a034d84..03fb3e0 100644 --- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs +++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs @@ -13,7 +13,6 @@ using Tiger.Business.WMS.Sharetronic.Shelf; using Tiger.Model.Entitys.MES.U9C; using Tiger.Model.MES.Yada; -using static IronPython.Modules._ast; namespace Tiger.Business.WMS.Transaction { @@ -22,6 +21,7 @@ /// </summary> public class In_BIZ_U9_RECEIPT : WmsTask, IIn_BIZ_U9_RECEIPT { + public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode) { base.Init(id, userCode, apiHost, orgCode); @@ -30,7 +30,7 @@ } #region Propertys & Variables - + public string CurOrderNo { get; set; } #endregion #region Functions @@ -216,6 +216,8 @@ return SetOutPutMqttMsg(action, input.Locale); } + CurOrderNo = receipt.ORDER_NO; + //鎵ц涓婃灦鏁版嵁澶勭悊 foreach (var item in CurInvItem.Items) { @@ -314,13 +316,18 @@ }); //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁 - action = DoIfFinish(action, input.Locale, () => { + action = DoIfFinish(action, input.Locale, () => + { //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣� if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty()) { SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation); } }); + //if (!action.Data.Data.IsNullOrEmpty() && action.Data.Data is DefaultInStoreOutput) + //{ + // (action.Data.Data as DefaultInStoreOutput).OrderInfo = receipt; + //} } catch (Exception ex) { @@ -461,6 +468,38 @@ return SetOutPutMqttMsg(action, locale); } + /// <summary> + /// 鑾峰彇闇�瑕佷笂鏋剁殑鏀惰揣鍗曞垪琛紙甯﹀垎椤碉級 + /// </summary> + /// <returns></returns> + public async Task<ApiAction<PageAble<BIZ_U9_RECEIPT>>> GetOrderList(BaseInputWithPage input) + { + var action = new ApiAction<PageAble<BIZ_U9_RECEIPT>>(); + var query = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(q => q.Status == 3) + .WhereIF(!input.OrderNo.IsNullOrEmpty(), q => q.DocNo.Contains(input.OrderNo)) + .OrderBy(q => q.DocNo).ToPage(input.pageIndex, input.pageSize); + + action.Data = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => query.data.Select(o => o.DocNo).Contains(q.ORDER_NO)).ToPageAsync(input.pageIndex, input.pageSize); + foreach (var order in action.Data.data) + { + order.ERP_STATUS_CODE = query.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.Status.ToString(); + order.ERP_STATUS_NAME = query.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.StatusName; + } + MainDB.Updateable(action.Data.data, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME }).ExecuteCommand(); + return action; + } + + /// <summary> + /// 鑾峰彇褰撳墠鏀惰揣鍗曚俊鎭� + /// </summary> + /// <returns></returns> + public async Task<ApiAction<BIZ_U9_RECEIPT>> GetCurOrder() + { + var action = new ApiAction<BIZ_U9_RECEIPT>(); + action.Data = MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurOrderNo).IncludesAllFirstLayer().First(); + return action; + } + #endregion /// <summary> -- Gitblit v1.9.3