问题修改

3 years ago · b75b730185
6 changed files with 76 additions and 33 deletions
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
@ -100,11 +100,16 @@ public interface SysOrganizationFeign {
    @GetMapping("/getListOrgByBrand/{orgSid}")
    ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid);

-    @ApiOperation("获取指定品牌下分公司")
+    @ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
    @ResponseBody
    @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
    ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid);

+    @ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid);
+
    @ApiOperation("获取指定分公司下部门信息")
    @ResponseBody
    @GetMapping("/getListDeptByOrgSid/{orgSid}")
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
@ -113,6 +113,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
        return null;
    }

+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+        return null;
+    }
+
    @Override
    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
        return null;
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@ -306,6 +306,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
        return sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
    }

+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+        return sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
+    }
+
    @Override
    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
        return sysOrganizationService.getListDeptByOrgSid(orgSid);
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@ -236,7 +236,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
            if (reduce1.size() > 0) {
                //根据staffSid查询token
                String token = sysUserService.selectByStaffsid(sid).getToken();
-                if(StringUtils.isNotBlank(token)){
+                if (StringUtils.isNotBlank(token)) {
                    //清空该token
                    redisUtil.remove(token);
                }
@ -267,13 +267,13 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
        entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
        this.saveOrUpdate(entity);
        //推送金蝶组织信息
-        if ("0".equals(entity.getIsDept())){
+        if ("0".equals(entity.getIsDept())) {
            OrgOrganizations orgOrganizations = new OrgOrganizations();
            orgOrganizations.setFName(entity.getName());
            orgOrganizations.setFNumber(entity.getOrgCode());
            orgOrganizations.setFOrgFormID("102");
            finKingDeeFeign.draftOrgOrganizations(orgOrganizations);
-        }else if ("1".equals(entity.getIsDept())){
+        } else if ("1".equals(entity.getIsDept())) {
            BdDepartment bdDepartment = new BdDepartment();
            bdDepartment.setFName(entity.getName());
            bdDepartment.setFNumber(entity.getOrgCode());
@ -420,6 +420,21 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
        return rb.success().setData(list);
    }

+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+        ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
+        BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(brandSid);
+        List<SysOrgVo> list = new ArrayList<>();
+        String useOrg = baseVehicleBrand.getUseOrg();
+        if (StringUtils.isNotBlank(useOrg)) {
+            String[] orgSidss = useOrg.split(",");
+            for (String sidss : orgSidss) {
+                SysOrgVo sysOrgVo = baseMapper.getListOrgByBrand(sidss);
+                list.add(sysOrgVo);
+            }
+        }
+        return rb.success().setData(list);
+    }
+
    public SysOrganization selectOrgCodeByPsid() {
        return baseMapper.selectOrgCodeByPsid();
    }
@ -554,7 +569,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa

    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
-        SysOrganizationVo vo = baseMapper.selectByPSid(sid,name);
+        SysOrganizationVo vo = baseMapper.selectByPSid(sid, name);
        return rb.success().setData(vo);
    }

--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java
@ -81,6 +81,6 @@ public class ScmVehicleExaminePageVo implements Vo {
    private String manufacturerName; // 供应商名称
    private String modelSid;

-  /*  @ApiModelProperty("外采 排产 调车 sid")
-    private String businessSid;*/
+    @ApiModelProperty("外采 排产 调车 sid")
+    private String businessSid;
 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@ -200,14 +200,18 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
            if ("1".equals(record.getInspectedType())) {
                record.setShowInspectedBtn(true);
            }
-            //品牌
-            BaseVehicleModel data = baseVehicleModelFeign.selectDetails(record.getModelSid()).getData();
-            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
-            //厂商sid
-            BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
-            //供应商名称
-            record.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
-
+            if (record.getPurchaseTypeKey().equals("002")) {
+                BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(record.getBusinessSid()).getData();
+                record.setManufacturerName(baseOutsourcingApplicationDetailsVo.getPurchasingUnitName());
+            } else {
+                //品牌
+                BaseVehicleModel data = baseVehicleModelFeign.selectDetails(record.getModelSid()).getData();
+                BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
+                //厂商sid
+                BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
+                //供应商名称
+                record.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
+            }
        }
        return iPage;
    }
@ -318,13 +322,18 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
        List<String> factoryImages = new ArrayList<>();
        List<String> carInspectedImages = new ArrayList<>();
        AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid);
-        //品牌
-        BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
-        BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
-        //厂商sid
-        BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
-        //供应商名称
-        vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
+        if (vo.getPurchaseKey().equals("002")) {
+            BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(vo.getBusinessSid()).getData();
+            vo.setManufacturerName(baseOutsourcingApplicationDetailsVo.getPurchasingUnitName());
+        } else {
+            //品牌
+            BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
+            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
+            //厂商sid
+            BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
+            //供应商名称
+            vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
+        }
        if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
            vo.setEditVin(true);
        } else {
@ -385,15 +394,19 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
        String type2 = "02"; // 验车相关照片 02
        List<String> factoryImages = new ArrayList<>();
        List<String> carInspectedImages = new ArrayList<>();
-
        AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
-        //品牌
-        BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
-        BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
-        //厂商sid
-        BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
-        //供应商名称
-        vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
+        if (vo.getPurchaseTypeKey().equals("002")) {
+            BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(vo.getBusinessSid()).getData();
+            vo.setManufacturerName(baseOutsourcingApplicationDetailsVo.getPurchasingUnitName());
+        } else {
+            //品牌
+            BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
+            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
+            //厂商sid
+            BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
+            //供应商名称
+            vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
+        }
        List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
        List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
        for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {
@ -550,7 +563,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                for (String s : factoryImage) {
                    if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
-                    }else{
+                    } else {
                        s1 = s;
                    }
                    ScmFile scmFile1 = new ScmFile();
@ -565,7 +578,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                for (String s : carInspectedImage) {
                    if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                        s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
-                    }else{
+                    } else {
                        s2 = s;
                    }
                    ScmFile scmFile2 = new ScmFile();
@ -706,7 +719,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                            }
                        } else if (depositUseRuleKey.equals("001")) {
                            int i = baseMapper.selectCountByBusSid(scmVehicleExamine.getBusinessSid());
-                            i = i+1;
+                            i = i + 1;
                            if (i > 1) {
                                finPaymentrecordDto.setCost(price);//付款金额
                            } else if (i == 1) {