|
|
|
@ -79,35 +79,35 @@ public class InvSubWarehouseController {
|
|
|
|
|
AuthAdmin authAdmin = customerService.getUserBean();
|
|
|
|
|
if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
|
|
|
|
|
if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) {
|
|
|
|
|
if (authAdmin.getCustomerId()==110) {
|
|
|
|
|
if (authAdmin.getCustomerId() == 110) {
|
|
|
|
|
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
filterInvWarehouseRequest.setSpUse(true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else{
|
|
|
|
|
} else {
|
|
|
|
|
//走这边表示单据选择的是往来单位里面调出调入的库
|
|
|
|
|
//判断单据类型是1就是设置单据需要需要查询除自己以外的分库
|
|
|
|
|
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
|
|
|
|
|
if(systemParamConfigEntity.getParamValue().equals("0")){
|
|
|
|
|
if (systemParamConfigEntity.getParamValue().equals("0")) {
|
|
|
|
|
//不允许调拨
|
|
|
|
|
// 查询总库信息
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
//查询仓库信息
|
|
|
|
|
//查询仓库信息
|
|
|
|
|
if(invSubWarehouseEntity!=null){
|
|
|
|
|
if (invSubWarehouseEntity != null) {
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
|
|
|
|
|
filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
|
|
|
|
|
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
|
|
|
|
|
filterInvWarehouseRequest.setCode(null);
|
|
|
|
|
}else {
|
|
|
|
|
return ResultVOUtils.error(999,"分库编号为空!");
|
|
|
|
|
} else {
|
|
|
|
|
return ResultVOUtils.error(999, "分库编号为空!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
//允许调拨
|
|
|
|
|
//查询总库信息
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId());
|
|
|
|
|
filterInvWarehouseRequest.setCode(null);
|
|
|
|
|
}
|
|
|
|
@ -125,7 +125,7 @@ public class InvSubWarehouseController {
|
|
|
|
|
// return ResultVOUtils.error(500, "用户或仓库不能未空!");
|
|
|
|
|
// }
|
|
|
|
|
AuthAdmin authAdmin = customerService.getUserBean();
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
|
|
|
|
|
filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId());
|
|
|
|
|
filterInvWarehouseRequest.setCode(null);
|
|
|
|
|
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest);
|
|
|
|
@ -142,6 +142,10 @@ public class InvSubWarehouseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean checkResult = invSubWarehouseService.checkDuplicateName(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getName());
|
|
|
|
|
if (checkResult) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "分库名称重复!");
|
|
|
|
|
}
|
|
|
|
|
FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
|
|
|
|
|
filterInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId());
|
|
|
|
|
InvSubWarehouseEntity codeEntity = invSubWarehouseService.selectMaxCode(filterInvWarehouseRequest);
|
|
|
|
|