diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WmsWarehouseExtendRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseExtendRest.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WmsWarehouseExtendRest.java rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseExtendRest.java index 1d183e2..ce99472 100644 --- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WmsWarehouseExtendRest.java +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseExtendRest.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @author wangpengfei * @date 2024/3/18 10:52 */ -public class WmsWarehouseExtendRest { +public class WarehouseExtendRest { @Autowired WarehouseExtendService wmsWarehouseExtendService; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseArea.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseArea.java index 1916848..0368aab 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseArea.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseArea.java @@ -21,4 +21,8 @@ public class WarehouseArea extends BaseEntity { private String volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 + + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaDto.java index 8c99417..8a60151 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaDto.java @@ -24,5 +24,9 @@ public class WarehouseAreaDto implements Dto { private String volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java index f2462c9..7db74a2 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java @@ -11,6 +11,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.warehouse.warehousearea.WarehouseAreaFeign; import com.yxt.wms.utils.OrgPathQuery; @@ -31,6 +32,8 @@ public class WarehouseAreaService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -113,7 +116,35 @@ public class WarehouseAreaService extends MybatisBaseService saveOrUpdate(WarehouseAreaDto dto) { ResultBean rb = ResultBean.fireFail(); - + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } return warehouseAreaFeign.saveOrUpdate(dto); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaVo.java index 62165a8..e365027 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaVo.java @@ -31,4 +31,8 @@ public class WarehouseAreaVo implements Vo { private String areaTypeSid;//货区类型 private String warehouseName;//仓库名称 private String areaTypeName;//货区类型名称 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java index 0f984b2..ec05776 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeDto.java @@ -21,5 +21,7 @@ public class WarehouseAreaTypeDto implements Dto { private String warehouseAreaTypeName;//库位类型名称 private String useOrgSid;//使用组织sid private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java index 1849347..1686e31 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java @@ -14,6 +14,7 @@ import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfoQuery; import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfoVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.warehouse.warehouseareatype.WarehouseAreaTypeFeign; import com.yxt.wms.utils.OrgPathQuery; @@ -35,6 +36,8 @@ public class WarehouseAreaTypeService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -106,7 +109,35 @@ public class WarehouseAreaTypeService extends MybatisBaseService saveOrUpdate(WarehouseAreaTypeDto dto) { - + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } return warehouseAreaTypeFeign.saveOrUpdate(dto); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java index 1413c7f..64ca0a6 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java @@ -24,13 +24,4 @@ public class WarehouseExtendDto implements Dto { private String markupRate3;//加价率3 private String markupRate4;//加价率4 private String markupRate5;//加价率5 - - - - - - - - - } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java index f381b27..fc4ff8d 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java @@ -38,4 +38,6 @@ public class WarehouseInfoDto implements Dto { private String createOrgSid;//创建组织sid // private List wmsWarehouseExtendDtos; private WarehouseExtendDto wmsWarehouseExtendDto; + private String userSid; //登录用户sid + private String orgPath; //组织全路径 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java index e2a7681..3c225d8 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -11,6 +11,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.warehouse.warehouseinfo.WarehouseFeign; import com.yxt.wms.utils.OrgPathQuery; @@ -32,6 +33,8 @@ public class WarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { @@ -112,7 +115,35 @@ public class WarehouseInfoService extends MybatisBaseService saveOrUpdate(WarehouseInfoDto dto) { - + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } return WarehouseFeign.saveOrUpdate(dto); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRack.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRack.java index 21108a3..48cdba9 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRack.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRack.java @@ -19,4 +19,6 @@ public class WarehouseRack extends BaseEntity { private String rackCode;//货架编码 private String warehouseSid;//仓库sid private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackDto.java index de2b6e8..84297b9 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackDto.java @@ -22,4 +22,8 @@ public class WarehouseRackDto implements Dto { private String rackCode;//货架编码 private String warehouseSid;//仓库sid private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; //登录用户sid + private String orgPath; //组织全路径 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java index f911d53..30aa720 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java @@ -8,12 +8,16 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.warehouse.wmswarehouserack.WarehouseRackFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -26,6 +30,10 @@ public class WarehouseRackService extends MybatisBaseService> listPage(PagerQuery pq) { @@ -95,7 +103,35 @@ public class WarehouseRackService extends MybatisBaseService saveOrUpdate(WarehouseRackDto dto) { - + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + } + } + } return warehouseRackFeign.saveOrUpdate(dto); } diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 0000000..a5338ce --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,25 @@ +package com.yxt.wms.feign.portal.sysstafforg; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 人员与机构 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "ss-common-portal-SysStaffOrg", + name = "ss-common-portal", + path = "/apiadmin/sysstafforg") +public interface SysStaffOrgFeign { + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +}