Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

分堆打包包裹明细异常修复

Browse Source
This commit is contained in:
gaoqr
2026-05-06 13:53:57 +08:00
parent b285f2a5d6
commit 3ac29c5ebc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+4 -4
View File
@@ -1224,8 +1224,8 @@ public class PackServiceImpl implements PackService {
// 查询配件 // 查询配件
List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo); List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo);
Collection<PackageDetailsRespVO> resultList = buildPackaPlateGroup(packPlateList); Collection<PackageDetailsRespVO> resultList = buildPackPlateGroup(packPlateList);
resultList.addAll(buildPackaPlateGroup(packPartsList)); resultList.addAll(buildPackPartsGroup(packPartsList));
return CollUtil.newArrayList(resultList); return CollUtil.newArrayList(resultList);
} }
@@ -1235,7 +1235,7 @@ public class PackServiceImpl implements PackService {
* @param plates * @param plates
* @return * @return
*/ */
private Collection<PackageDetailsRespVO> buildPackaPlateGroup(List<PackageDetailsRespVO> plates) { private Collection<PackageDetailsRespVO> buildPackPlateGroup(List<PackageDetailsRespVO> plates) {
Map<String, PackageDetailsRespVO> map = new LinkedHashMap<>(); Map<String, PackageDetailsRespVO> map = new LinkedHashMap<>();
for (PackageDetailsRespVO row : plates) { for (PackageDetailsRespVO row : plates) {
@@ -1285,7 +1285,7 @@ public class PackServiceImpl implements PackService {
} }
} }
return values; return new ArrayList<>(values);
} }
/** /**
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/logback-spring.xml
+1 -1
View File
@@ -87,7 +87,7 @@
<!-- 本地环境 --> <!-- 本地环境 -->
<springProfile name="local"> <springProfile name="local">
<root level="DEBUG"> <root level="INFO">
<appender-ref ref="STDOUT"/> <appender-ref ref="STDOUT"/>
<appender-ref ref="ASYNC"/> <!-- 本地环境下，如果不想打印日志，可以注释掉本行 --> <appender-ref ref="ASYNC"/> <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
<appender-ref ref="ERROR_FILE"/> <appender-ref ref="ERROR_FILE"/>