From fcb50f9e6408bf42e3bc5d34d9f6eff93c2dd263 Mon Sep 17 00:00:00 2001 From: wankeda <Administrator@DESKTOP-HAU3ST3> Date: 星期六, 01 三月 2025 17:36:16 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 181 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 181 insertions(+), 0 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" index 341b487..1eaaae3 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" @@ -543,5 +543,186 @@ return WebResponseContent.Instance.Error(ex.Message); } } + + #region + ///// <summary> + ///// 鐢熸垚鍑哄簱浠诲姟 + ///// </summary> + ///// <param name="keys">鍑哄簱鍗曟槑缁嗕富閿�</param> + ///// <returns></returns> + //public WebResponseContent MESPPGenerateOutboundTasks(int[] keys) + //{ + // try + // { + // List<Dt_Task> tasks = new List<Dt_Task>(); + // List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>(); + // List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>(); + // List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = new List<Dt_MesPPOutboundOrderDetail>(); + // List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>(); + // List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>(); + + // (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = MESPPOutboundTaskDataHandle(keys); + // if (result.Item2 != null && result.Item2.Count > 0) + // { + // stockInfos.AddRange(result.Item2); + // } + // if (result.Item3 != null && result.Item3.Count > 0) + // { + // outboundOrderDetails.AddRange(result.Item3); + // } + // if (result.Item4 != null && result.Item4.Count > 0) + // { + // outStockLockInfos.AddRange(result.Item4); + // } + // if (result.Item5 != null && result.Item5.Count > 0) + // { + // locationInfos.AddRange(result.Item5); + // } + // if (result.Item1 != null && result.Item1.Count > 0) + // { + // tasks.AddRange(result.Item1); + // } + + // WebResponseContent content = MESPPGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos); + // return content; + // } + // catch (Exception ex) + // { + // _unitOfWorkManage.RollbackTran(); + // return WebResponseContent.Instance.Error(ex.Message); + // } + //} + + ///// <summary> + ///// 鍑哄簱浠诲姟鏁版嵁澶勭悊 + ///// </summary> + ///// <param name="orderDetailId"></param> + ///// <param name="stockSelectViews"></param> + ///// <returns></returns> + ///// <exception cref="Exception"></exception> + //public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) MESPPOutboundTaskDataHandle(int[] keys) + //{ + // List<Dt_Task> tasks = new List<Dt_Task>(); + // List<Dt_MesPPOutboundOrderDetail> outboundOrderDetailss = _outboundService.MesPPOutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id)); + // List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = BaseDal.Db.Queryable<Dt_MesPPOutboundOrderDetail>().Where(x => keys.Contains(x.Id)).ToList(); + // if (outboundOrderDetails == null || outboundOrderDetails.Count == 0) + // { + // throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅"); + // } + // if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null) + // { + // throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�"); + // } + // List<Dt_StockInfo>? stockInfos = null; + // List<Dt_MesPPOutboundOrderDetail>? orderDetails = null; + // List<Dt_OutStockLockInfo>? outStockLockInfos = null; + // List<Dt_LocationInfo>? locationInfos = null; + // //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt()) + // { + // (List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails); + + // if (result.Item1 != null && result.Item1.Count > 0) + // { + // Dt_MesPPOutboundOrder outboundOrder = _outboundService.MesPPOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId); + // TaskTypeEnum typeEnum = outboundOrder.OrderType switch + // { + // (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound, + // (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate, + // (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality, + // _ => new TaskTypeEnum() + // }; + // tasks = GetTasks(result.Item1, typeEnum); + // result.Item2.ForEach(x => + // { + // x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt(); + // }); + // result.Item3.ForEach(x => + // { + // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(); + // }); + + // stockInfos = result.Item1; + // orderDetails = result.Item2; + // outStockLockInfos = result.Item3; + // locationInfos = result.Item4; + // } + // else + // { + // throw new Exception("鏃犲簱瀛�"); + // } + // } + // //else + // //{ + // // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.宸插垎閰�); + // // if (stockLockInfos != null && stockLockInfos.Count > 0) + // // { + // // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList()); + // // tasks = GetTasks(stocks); + // // } + // //} + + // return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos); + //} + + ///// <summary> + ///// 鐢熸垚鍑哄簱浠诲姟鍚庢暟鎹洿鏂板埌鏁版嵁搴� + ///// </summary> + ///// <param name="tasks"></param> + ///// <param name="stockInfos"></param> + ///// <param name="outboundOrderDetails"></param> + ///// <param name="outStockLockInfos"></param> + ///// <param name="locationInfos"></param> + ///// <returns></returns> + //public WebResponseContent MESPPGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null) + //{ + // try + // { + // _unitOfWorkManage.BeginTran(); + + // BaseDal.AddData(tasks); + // if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0) + // { + // stockInfos.ForEach(x => + // { + // x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt(); + // }); + // WebResponseContent content = _outboundService.MesPPOutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks); + + // if (!content.Status) + // { + // _unitOfWorkManage.RollbackTran(); + // return content; + // } + // } + // else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0) + // { + // outboundOrderDetails.ForEach(x => + // { + // x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt(); + // }); + + // _outboundService.MesPPOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails); + // } + // _unitOfWorkManage.CommitTran(); + // PushTasksToWCS(tasks); + // return WebResponseContent.Instance.OK(); + // } + // catch (Exception ex) + // { + // _unitOfWorkManage.RollbackTran(); + // return WebResponseContent.Instance.Error(ex.Message); + // } + + //} + #endregion + + + + + + + + + } } \ No newline at end of file -- Gitblit v1.9.3