6/19

wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WmsWarehouseExtendRest.java → 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;

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
+
 }

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; //组织全路径
 
 }

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<WarehouseAreaMapper
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
     SysUserFeign sysUserFeign;
     public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -113,7 +116,35 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
 
     public ResultBean<String> 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<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();
+                }
+                dto.setUseOrgSid(deptSid);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
+                    dto.setCreateOrgSid(createOrgSid);
+                }
+            }
+        }
         return warehouseAreaFeign.saveOrUpdate(dto);
     }
 

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; //组织全路径
 }

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; //组织全路径
 
 }

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<WarehouseAreaTy
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
     SysUserFeign sysUserFeign;
     public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -106,7 +109,35 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseAreaTypeDto dto) {
-
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(dto.getSid())) {
+            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();
+                }
+                dto.setUseOrgSid(deptSid);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
+                    dto.setCreateOrgSid(createOrgSid);
+                }
+            }
+        }
         return warehouseAreaTypeFeign.saveOrUpdate(dto);
     }
 

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
-
-
-
-
-
-
-
-
-
 }

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<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
     private WarehouseExtendDto wmsWarehouseExtendDto;
+    private String userSid; //登录用户sid
+    private String orgPath; //组织全路径
 }

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<WarehouseInfoMapper
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
     SysUserFeign sysUserFeign;
 
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
@@ -112,7 +115,35 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
-
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(dto.getSid())) {
+            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();
+                }
+                dto.setUseOrgSid(deptSid);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
+                    dto.setCreateOrgSid(createOrgSid);
+                }
+            }
+        }
         return WarehouseFeign.saveOrUpdate(dto);
     }
 

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
 }

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; //组织全路径
 }

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<WarehouseRackMapper
     @Autowired
     WarehouseRackFeign warehouseRackFeign;
     @Autowired
+    SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
     SysUserFeign sysUserFeign;
 
     public ResultBean<PagerVo<WarehouseRackVo>> listPage(PagerQuery<WarehouseRackQuery> pq) {
@@ -95,7 +103,35 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseRackDto dto) {
-
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(dto.getSid())) {
+            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();
+                }
+                dto.setUseOrgSid(deptSid);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
+                    dto.setCreateOrgSid(createOrgSid);
+                }
+            }
+        }
         return warehouseRackFeign.saveOrUpdate(dto);
     }
 

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<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
+}