Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -119,4 +119,10 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     List<BaseDistributorListVo> selectDisList(String orgSid);
 
     List<BaseDistributorsListVo> getDistributors(BaseDistributorsListQuery pagerQuery, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw);
+
+    @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0")
+    BaseDistributorsListVo selByNameAndOrgSid(@Param("disName") String disName,@Param("createOrg") String createOrg);
+
+    @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0 and sid != #{sid}")
+    BaseDistributorsListVo selByNameAndOrgSidAndSid(@Param("disName") String disName,@Param("createOrg") String createOrg,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -319,6 +319,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             baseDistributor.setDisLevelKey("0002");
             baseDistributor.setDisLevelValue("次级");
         }
+        BaseDistributorsListVo baseDistributorsListVo = baseMapper.selByNameAndOrgSid(baseDistributor.getDisName(), baseDistributor.getCreateOrg());
+        if (baseDistributorsListVo != null){
+            return rb.setMsg("该经销商名称已存在");
+        }
         boolean isSave = save(baseDistributor);
         if (!isSave) {
             return rb.setMsg("经销商信息保存失败");
@@ -407,6 +411,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
 
     public ResultBean updateAll(BaseDistributorDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
+        BaseDistributorsListVo baseDistributorsListVo = baseMapper.selByNameAndOrgSidAndSid(dto.getDisName(), dto.getCreateOrg(), sid);
+        if (baseDistributorsListVo != null){
+            return rb.setMsg("该经销商名称已存在");
+        }
         List<BaseDistributorAppendixDto> yyzzList = dto.getYyzzList();
         List<BaseDistributorAppendixDto> dlysxkzList = dto.getDlysxkzList();
         List<BaseDistributorAppendixDto> frsfzList = dto.getFrsfzList();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -182,4 +182,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
         return null;
     }
+
+    @Override
+    public ResultBean<SysOrganization> selectByOrgCode(String orgCode) {
+        return null;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -511,7 +511,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     baseVehicleDto.setManPurOrderTypeKey(scmVehicleEnterlibrary.getPurchaseTypeKey());
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
-
+                    baseVehicleDto.setOrgPriceDate(scmVehicleEnterlibrary.getInboundDate());
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());
@@ -567,6 +567,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
                     baseVehicleDto.setSalePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     baseVehicleDto.setContractPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                    //公司入库日期
+                    baseVehicleDto.setOrgPriceDate(scmVehicleEnterlibrary.getInboundDate());
                     //根据车型sid查询品牌及名称及厂商sid
                     baseVehicleDto.setSupplierSid(internalPurchaseDetailsVo.getSellerOrgSid());
                     //供应商code