mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
禅道bug#1679修复
This commit is contained in:
+4
-2
@@ -1408,8 +1408,10 @@ public class PackServiceImpl implements PackService {
|
|||||||
Set<Long> orderIds = Set.of(orderId);
|
Set<Long> orderIds = Set.of(orderId);
|
||||||
List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo);
|
List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo);
|
||||||
List<PackageDetailsRespVO> packPlateList = orderPlateMapper.selectPackedPlateList(orderIds, packageNo);
|
List<PackageDetailsRespVO> packPlateList = orderPlateMapper.selectPackedPlateList(orderIds, packageNo);
|
||||||
packPlateList.addAll(packPartsList);
|
|
||||||
return packPlateList;
|
Collection<PackageDetailsRespVO> resultList = buildPackPlateGroup(packPlateList);
|
||||||
|
resultList.addAll(buildPackPartsGroup(packPartsList));
|
||||||
|
return CollUtil.newArrayList(resultList);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user