diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java index 6272b7aa..ee3762fa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java @@ -57,6 +57,7 @@ public class StIvtCheckdtlBcpServiceImpl extends ServiceImpl sect_wrapper = new QueryWrapper<>(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java index 4abd11a7..2175132a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java @@ -24,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -47,8 +44,14 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl list = rows.stream() - .sorted(Comparator.comparing(row -> (Integer)((Map) row).get("canuse_qty")).reversed()).collect(Collectors.toList()); + ArrayList objects = new ArrayList<>(); + rows.forEach(row -> { + JSONObject jsonObject = (JSONObject) JSON.toJSON(row); + objects.add(jsonObject); + }); + + List list = objects.stream() + .sorted(Comparator.comparing(row -> ((JSONObject) row).getDoubleValue("canuse_qty")).reversed()).collect(Collectors.toList()); rows = JSONArray.parseArray(JSON.toJSONString(list)); StIvtStructattr first_struct = null;