|
|
|
@ -69,10 +69,11 @@ public class ThrInvWarehouseController {
|
|
|
|
|
List<ThrInvWarehouseEntity> ThrInvWarehouseEntityList = new ArrayList<>();
|
|
|
|
|
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByPid(invSubWarehouseEntity.getParentId());
|
|
|
|
|
for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
|
|
|
|
|
if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) && invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){
|
|
|
|
|
if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) || invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){
|
|
|
|
|
//添加集合中
|
|
|
|
|
ThrInvWarehouseEntityList.add(thrInvWarehouseEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(ThrInvWarehouseEntityList.size()==0){
|
|
|
|
|
invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
|
|
|
|
|