|
|
|
@ -24,7 +24,6 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse;
|
|
|
|
|
import com.glxp.api.service.auth.*;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
|
|
|
|
import com.glxp.api.service.system.SystemParamConfigService;
|
|
|
|
|
import com.glxp.api.util.BeanCopyUtils;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
@ -170,9 +169,15 @@ public class InvWarehouseController extends BaseController {
|
|
|
|
|
filterInvSubWarehouseRequest.setAdvanceType(1);
|
|
|
|
|
}
|
|
|
|
|
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
|
|
|
|
|
List<InvWarehouseEntity> invWarehouseEntities1 = new ArrayList<>();
|
|
|
|
|
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
|
|
|
|
|
if(!"".equals(invWarehouseEntity.getParentCode())){
|
|
|
|
|
invWarehouseEntities1.add(invWarehouseEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<InvWarehouseEntity> results = new ArrayList<>();
|
|
|
|
|
if (CollUtil.isNotEmpty(invWarehouseEntities)) {
|
|
|
|
|
invWarehouseEntities.forEach(invWarehouseEntity -> {
|
|
|
|
|
if (CollUtil.isNotEmpty(invWarehouseEntities1)) {
|
|
|
|
|
invWarehouseEntities1.forEach(invWarehouseEntity -> {
|
|
|
|
|
if (!invWarehouseEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) {
|
|
|
|
|
results.add(invWarehouseEntity);
|
|
|
|
|
}
|
|
|
|
|