| 项目代码/WMS/WMSClient/src/views/outbound/outSGOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 项目代码/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ÏîÄ¿´úÂë/WMS/WMSClient/src/views/outbound/outSGOrder.vue
@@ -1,16 +1,7 @@ <template> <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields" :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions" :table="table" :extend="extend" > <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields" :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions" :table="table" :extend="extend"> </view-grid> </template> <script> @@ -126,6 +117,13 @@ field: "createDate", title: "å建æ¶é´", type: "datetime", width: 160, align: "left", }, { field: "materialNoWidth", title: "ç©æç¼å·ï¼å¹ 宽ï¼", type: "string", width: 160, align: "left", }, @@ -280,4 +278,3 @@ }, }); </script> ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs
@@ -1,4 +1,4 @@ using SqlSugar; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -73,6 +73,12 @@ public string Remark { get; set; } /// <summary> /// ç©æç¼å·ï¼å¹ å®½ï¼ /// </summary> [SugarColumn(IsIgnore = true, ColumnDescription = "ç©æç¼å·ï¼å¹ 宽ï¼")] public string MaterialNoWidth { get; set; } /// <summary> /// éè´å表 /// </summary> [Navigate(NavigateType.OneToMany, nameof(Dt_OutSGOrderDetail.OutSGOrderId), nameof(Id))] ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs
@@ -1,4 +1,4 @@ using AutoMapper; using AutoMapper; using System; using System.Collections.Generic; using System.Linq; @@ -23,6 +23,8 @@ using System.Text.RegularExpressions; using Microsoft.AspNetCore.Http; using HslCommunication; using SqlSugar; using WIDESEA_Core.Enums; namespace WIDESEA_OutboundService { @@ -46,6 +48,51 @@ _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();