Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1818,6 +1818,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			hasOrderPackageCodeList.addAll(hasOrderPackageCodes);
 		});
 
+		if(CollUtil.isNotEmpty(hasOrderPackageCodeList)){
 			List<TrunklineAdvanceDetailEntity> updateMaterialList = new ArrayList<>();
 			//把importStandardOuPaiDTOS转化成orderPackageCode为key的Map
 			Map<String, ImportStandardOuPaiDTO> importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a));
@@ -1841,6 +1842,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailService.updateBatchById(updateMaterialList);
 			}
 
+		}
+
 		//排除importStandardOuPaiDTOS中orderPackageCode在hasOrderPackageCodeList中存在的元素
 		importStandardOuPaiDTOS = importStandardOuPaiDTOS.stream().filter(item -> !hasOrderPackageCodeList.contains(item.getOrderPackageCode())).collect(Collectors.toList());