mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
分堆打包包裹明细异常修复
This commit is contained in:
+4
-4
@@ -1224,8 +1224,8 @@ public class PackServiceImpl implements PackService {
|
||||
// 查询配件
|
||||
List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo);
|
||||
|
||||
Collection<PackageDetailsRespVO> resultList = buildPackaPlateGroup(packPlateList);
|
||||
resultList.addAll(buildPackaPlateGroup(packPartsList));
|
||||
Collection<PackageDetailsRespVO> 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<PackageDetailsRespVO> buildPackaPlateGroup(List<PackageDetailsRespVO> plates) {
|
||||
private Collection<PackageDetailsRespVO> buildPackPlateGroup(List<PackageDetailsRespVO> plates) {
|
||||
Map<String, PackageDetailsRespVO> map = new LinkedHashMap<>();
|
||||
|
||||
for (PackageDetailsRespVO row : plates) {
|
||||
@@ -1285,7 +1285,7 @@ public class PackServiceImpl implements PackService {
|
||||
}
|
||||
}
|
||||
|
||||
return values;
|
||||
return new ArrayList<>(values);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@
|
||||
|
||||
<!-- 本地环境 -->
|
||||
<springProfile name="local">
|
||||
<root level="DEBUG">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<appender-ref ref="ASYNC"/> <!-- 本地环境下,如果不想打印日志,可以注释掉本行 -->
|
||||
<appender-ref ref="ERROR_FILE"/>
|
||||
|
||||
Reference in New Issue
Block a user