From 054cdadbfefdcc25ddf8fe65472203cc32022b0d Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Tue, 15 Jul 2025 17:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=95=B0=E9=87=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/OutStockTaskService.cs | 2 +- src/WMS.Web.Domain/Services/Public/ErpService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index fc64f484..da631788 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -643,7 +643,7 @@ namespace WMS.Web.Domain.Services // response.Details = response.Details.OrderByDescending(s => s.Specifications); // .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList(); // response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); - response.Details = response.Details.OrderByDescending(s => s.Method).OrderByDescending(y=>y.Specifications) + response.Details = response.Details.OrderByDescending(s => s.Method).OrderByDescending(y=>y.Specifications).OrderByDescending(x=>x.Qty) .ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength).ToList(); //alter by yzh 20250715 加了：.OrderByDescending(y=>y.Specifications) for (int i = 0; i < response.Details.Count(); i++) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index bec2310e..094b6f8e 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1161,7 +1161,7 @@ namespace WMS.Web.Domain.Services.Public //1.审核状态：已审核 //2.禁用状态：A否，B是 //3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的） - param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and (FUseOrgId=19162897 or FUseOrgId=100008)"; + param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and (FUseOrgId=19162897 or FUseOrgId=100008) "; //param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008"; param.OrderString = "FCreateDate ASC";