|
|
|
@ -14,6 +14,11 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtend; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendService; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo; |
|
|
|
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; |
|
|
|
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.wms.feign.portal.sysuser.SysUserFeign; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
@ -33,22 +38,62 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WmsWarehouseExtendService wmsWarehouseExtendService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WmsWarehouseInfoQuery query = pq.getParams(); |
|
|
|
QueryWrapper<WmsWarehouseInfo> qw = new QueryWrapper<>(); |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("w.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<WmsWarehouseInfoVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<WmsWarehouseInfoVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getName())){ |
|
|
|
qw.like("warehouseName",query.getName()); |
|
|
|
qw.like("w.warehouseName",query.getName()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getCode())){ |
|
|
|
qw.like("warehouseCode",query.getCode()); |
|
|
|
qw.like("w.warehouseCode",query.getCode()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getAddress())){ |
|
|
|
qw.like("address",query.getAddress()); |
|
|
|
qw.like("w.address",query.getAddress()); |
|
|
|
} |
|
|
|
qw.ne("isDelete",1); |
|
|
|
qw.orderByDesc("sortNo"); |
|
|
|
qw.ne("w.isDelete",1); |
|
|
|
IPage<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw); |
|
|
|
PagerVo<WmsWarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
@ -64,32 +109,68 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
public ResultBean<String> saveOrUpdate(WmsWarehouseInfoDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = ""; |
|
|
|
String orgPath = dto.getOrgPath(); |
|
|
|
if (StringUtils.isNotBlank(dto.getSid())) { |
|
|
|
sid = dto.getSid(); |
|
|
|
WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); |
|
|
|
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); |
|
|
|
wmsWarehouse.setModifyTime(new Date()); |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(),wmsWarehouse.getUseOrgSid(),sid); |
|
|
|
if (warehouseInfo != null) { |
|
|
|
return rb.setMsg("仓库编码重复"); |
|
|
|
} |
|
|
|
baseMapper.updateById(wmsWarehouse); |
|
|
|
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
|
|
|
|
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
|
|
|
|
// }
|
|
|
|
if(dto.getWmsWarehouseExtendDto()!=null){ |
|
|
|
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); |
|
|
|
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); |
|
|
|
} |
|
|
|
// if(dto.getWmsWarehouseExtendDto()!=null){
|
|
|
|
// dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
|
|
|
|
// wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
|
|
|
|
// }
|
|
|
|
} else { |
|
|
|
WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo(); |
|
|
|
sid = wmsWarehouse.getSid(); |
|
|
|
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); |
|
|
|
wmsWarehouse.setCreateTime(new DateTime()); |
|
|
|
wmsWarehouse.setCreateBySid(dto.getUserSid()); |
|
|
|
String deptName = ""; |
|
|
|
String deptSid = ""; |
|
|
|
String createOrgSid = ""; |
|
|
|
if (StringUtils.isNotBlank(orgPath)) { |
|
|
|
List<String> split = Arrays.asList(orgPath.split("/")); |
|
|
|
if (split.size() > 1) { |
|
|
|
//获取本级sid获取本级部门信息
|
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); |
|
|
|
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); |
|
|
|
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); |
|
|
|
deptName = sysOrganization1.getName(); |
|
|
|
deptSid = sysOrganization1.getSid(); |
|
|
|
} else { |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); |
|
|
|
deptName = sysOrganization.getName(); |
|
|
|
deptName = sysOrganization.getName(); |
|
|
|
deptSid = sysOrganization.getSid(); |
|
|
|
} |
|
|
|
wmsWarehouse.setUseOrgSid(deptSid); |
|
|
|
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
//创建组织使用组织
|
|
|
|
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); |
|
|
|
if (organizationResultBean.getData() != null) { |
|
|
|
wmsWarehouse.setCreateOrgSid(createOrgSid); |
|
|
|
} |
|
|
|
} |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(),deptSid); |
|
|
|
if (warehouseInfo != null) { |
|
|
|
return rb.setMsg("仓库编码重复"); |
|
|
|
} |
|
|
|
baseMapper.insert(wmsWarehouse); |
|
|
|
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
|
|
|
|
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
|
|
|
|
// }
|
|
|
|
if(dto.getWmsWarehouseExtendDto()!=null){ |
|
|
|
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); |
|
|
|
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); |
|
|
|
} |
|
|
|
// if(dto.getWmsWarehouseExtendDto()!=null){
|
|
|
|
// dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
|
|
|
|
// wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
|
|
|
|
// }
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ -131,7 +212,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); |
|
|
|
if (null != wmsWarehouse) { |
|
|
|
wmsWarehouse.setIsEnable(Integer.parseInt(isEnable)); |
|
|
|
if (isEnable.equals("1")) { |
|
|
|
wmsWarehouse.setUsageStatus(isEnable); |
|
|
|
} else if (isEnable.equals("2")) { |
|
|
|
wmsWarehouse.setUsageStatus("0"); |
|
|
|
} |
|
|
|
baseMapper.updateById(wmsWarehouse); |
|
|
|
} |
|
|
|
return rb.success().setMsg("成功"); |
|
|
|
|
