单据排序问题

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -137,7 +137,9 @@ public class StockOrderDetailController {
             }
         }
         Collections.sort(resultList, (o1, o2) -> {
-            Integer cp = o1.getCodeId() - o2.getCodeId();
+            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;
         });
 

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -446,6 +446,13 @@ public class StockQRCodeTextController {
             stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
             List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
             List<StockOrderPrintEntity> list = stockOrderService.listCodePrint(stockOrderEntity.getOrderIdFk());
+            Collections.sort(list, (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;
+            });
+
             if (list != null && list.size() > 0) {
                 SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
                 SystemPDFTemplateEntity systemPDFTemplateEntity =

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java

@@ -603,7 +603,9 @@ public class OrderDetailController {
             }
         }
         Collections.sort(resultList, (o1, o2) -> {
-            Integer cp = o1.getCodeId() - o2.getCodeId();
+            String o1Str = o1.getCoName() + o1.getPackSpec() + o1.getBatchNo() + o1.getSerialNo();
+            String o2Str = o2.getCoName() + o2.getPackSpec() + o2.getBatchNo() + o1.getSerialNo();
+            Integer cp = o1Str.compareTo(o2Str);
             return cp;
         });
         return resultList;