From 8f2a136390048d1938290b2e7002ca6ee7a320ba Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Wed, 16 Jul 2025 13:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/OutStockTaskService.cs | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index a7b06bd8..08f266d5 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -640,14 +640,39 @@ namespace WMS.Web.Domain.Services response.Details.Add(infoDetail); } //排序和加序号值 - response.Details = response.Details.OrderByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength) + response.Details = response.Details.OrderByDescending(s => s.Specifications).ThenBy(s => s.Method) // .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty) // response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); //response.Details = response.Details.OrderByDescending(s => s.Method).ThenBy(s => s.Specifications).ThenByDescending(s => s.BoxBillNo).ThenByDescending(s=>s.Qty) - .ThenByDescending(s => s.Specifications).ThenByDescending(s => s.Qty) + .ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength).ThenByDescending(s => s.Qty) .ToList(); - //alter by yzh 20250715 加了：.OrderByDescending(y=>y.Specifications) + ////alter by yzh 20250715 加了：.OrderByDescending(y=>y.Specifications) + //for (int i = 0; i < response.Details.Count(); i++) + //{ + // if (i == 0) + // response.Details[0].IndexNumber = 1; + // else + // { + // //和上一个箱子比 如果是相同的箱子序号一样 + // if (response.Details[i].BoxBillNo == response.Details[i - 1].BoxBillNo) + // response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber; + // else + // response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber + 1; + + // //if (response.Details[i].BoxBillNo == response.Details[i - 1].BoxBillNo) + // // response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber; + // //else + // // response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber + 1; + // } + //} + + + //排序和加序号值以下为最先的 + + response.Details = response.Details.OrderByDescending(s => s.Method) + .ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength).ToList(); + for (int i = 0; i < response.Details.Count(); i++) { if (i == 0) @@ -661,6 +686,8 @@ namespace WMS.Web.Domain.Services response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber + 1; } } + //结束最先的 + return Result.ReSuccess(response); }