From fadd87ee22c715e0e81f70c66d16aa7c0d469b67 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 25 Mar 2023 10:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=92=8C=E5=8D=95=E6=8D=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/mipsdl/admin/client/http/PhxyyClient.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java index 480db98..cc34197 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java @@ -307,6 +307,14 @@ public class PhxyyClient { if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) { stockOrderDetailEntities = transferSerList(stockOrderDetailEntities, stockOrderEntity.getOrderIdFk()); + + Collections.sort(stockOrderDetailEntities, (o1, o2) -> { + String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo(); + String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo(); + Integer cp = o1Str.compareTo(o2Str); + return cp; + }); + } for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {