| | |
| | | using AutoMapper; |
| | | using AutoMapper; |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | |
| | | using System.Text.RegularExpressions; |
| | | using Microsoft.AspNetCore.Http; |
| | | using HslCommunication; |
| | | using SqlSugar; |
| | | using WIDESEA_Core.Enums; |
| | | |
| | | namespace WIDESEA_OutboundService |
| | | { |
| | |
| | | _unitOfWorkManage = unitOfWorkManage; |
| | | } |
| | | |
| | | public override PageGridData<Dt_OutSGOrder> GetPageData(PageDataOptions options) |
| | | { |
| | | // 1. è°ç¨åºç±»æ¹æ³è·ååé¡µæ°æ® |
| | | PageGridData<Dt_OutSGOrder> pageData = base.GetPageData(options); |
| | | |
| | | // 2. å¦æææ°æ®ï¼å¤çæ¯ä¸ªè®¢åçç©æç¼å·åå¹
宽 |
| | | if (pageData.Rows != null && pageData.Rows.Count > 0) |
| | | { |
| | | // è·åææè®¢åID |
| | | var orderIds = pageData.Rows.Select(o => o.Id).ToList(); |
| | | |
| | | // æ¹éæ¥è¯¢ææå
³èçæç»ï¼è¿æ»¤æç©æç¼å·ä¸ºç©ºçæ°æ® |
| | | var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>() |
| | | .Where(d => orderIds.Contains(d.OutSGOrderId) && !string.IsNullOrEmpty(d.MaterialNo)) |
| | | .ToList(); |
| | | |
| | | // æè®¢åIDåç» |
| | | var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId).ToDictionary(g => g.Key, g => g.ToList()); |
| | | |
| | | // å¤çæ¯ä¸ªè®¢å |
| | | foreach (var order in pageData.Rows) |
| | | { |
| | | if (detailsByOrderId.TryGetValue(order.Id, out var details)) |
| | | { |
| | | // æç©æç¼å·åå¹
宽çç»ååç»ï¼è¥ç©æä»£ç ç¸åä½å¹
宽ä¸åï¼ä¼è¢«åæä¸åçç» |
| | | var materialGroups = details |
| | | .GroupBy(d => new { |
| | | MaterialNo = d.MaterialNo, |
| | | Width = d.Width |
| | | }) |
| | | .Select(g => $"{g.Key.MaterialNo}({g.Key.Width})").ToList(); |
| | | |
| | | // å°åç»ç»æå并为ä¸ä¸ªå符串ï¼å¤ä¸ªç»ä¹é´ç¨éå·åé |
| | | order.MaterialNoWidth = string.Join(",", materialGroups); |
| | | } |
| | | else |
| | | { |
| | | order.MaterialNoWidth = ""; |
| | | } |
| | | } |
| | | } |
| | | |
| | | return pageData; |
| | | } |
| | | |
| | | public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs) |
| | | { |
| | | WebResponseContent content = new WebResponseContent(); |