Merge branch 'dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -494,7 +494,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				BasicdataStoreBrandEntity brandList = basicdataStoreBrandClient.getBrandList(entryEntity.getClientId(), i.getBrandName());
 				if(Func.isNotEmpty(brandList)){
 					detail.setBrandName(brandList.getBrandName());
-					detail.setBrandId(Long.parseLong(brandList.getBrandId()));
+					detail.setBrandId(brandList.getBrandId());
 				}else{
 					throw new ServiceException(i.getProductName()+i.getProductCode()+i.getSku()+"品牌信息不存在！！请维护客户品牌数据！！！");
 				}
@@ -505,7 +505,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				}else{
 					throw new ServiceException(i.getProductName()+i.getProductCode()+i.getSku()+"物料信息不存在！！请维护基础数据！！！");
 				}
-				if(detailEntityList.size() > 0){
+				if(!detailEntityList.isEmpty()){
 					boolean b = detailEntityList.stream().anyMatch(a -> a.getProductCode().equals(detail.getProductCode()) && a.getProductName().equals(detail.getProductName()) && a.getSku().equals(detail.getSku()));
 					if(b){
 						detailEntityList.stream().filter(a -> a.getProductCode().equals(detail.getProductCode()) && a.getProductName().equals(detail.getProductName()) && a.getSku().equals(detail.getSku())).forEach( f->f.setCreateInventory(f.getCreateInventory()+detail.getCreateInventory()));