diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java index 7eba5f43b..101378a1f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java @@ -1224,8 +1224,8 @@ public class PackServiceImpl implements PackService { // 查询配件 List packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo); - Collection resultList = buildPackaPlateGroup(packPlateList); - resultList.addAll(buildPackaPlateGroup(packPartsList)); + Collection resultList = buildPackPlateGroup(packPlateList); + resultList.addAll(buildPackPartsGroup(packPartsList)); return CollUtil.newArrayList(resultList); } @@ -1235,7 +1235,7 @@ public class PackServiceImpl implements PackService { * @param plates * @return */ - private Collection buildPackaPlateGroup(List plates) { + private Collection buildPackPlateGroup(List plates) { Map map = new LinkedHashMap<>(); for (PackageDetailsRespVO row : plates) { @@ -1285,7 +1285,7 @@ public class PackServiceImpl implements PackService { } } - return values; + return new ArrayList<>(values); } /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/logback-spring.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/logback-spring.xml index 90f9018af..5b4c63590 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/logback-spring.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/logback-spring.xml @@ -87,7 +87,7 @@ - +