测试文档问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java

@@ -109,4 +109,6 @@ public class BaseManufacturer extends BaseEntity {
     private String city;
     @ApiModelProperty(value = "县区")
     private String county;
+    @ApiModelProperty(value = "厂商开户行sid")
+    private String manBankSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java

@@ -81,4 +81,6 @@ public class BaseManufacturerDetailsVo implements Vo {
     private String city;
     @ApiModelProperty(value = "县区")
     private String county;
+    @ApiModelProperty(value = "厂商开户行sid")
+    private String manBankSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java

@@ -121,4 +121,6 @@ public class BaseManufacturerDto implements Dto {
 
     @ApiModelProperty(value = "使用组织名称")
     private String useOrgName;
+    @ApiModelProperty(value = "厂商开户行sid")
+    private String manBankSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -57,6 +57,16 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);
 
+    /**
+     * 生成厂商开户行信息到供应商
+     *
+     * @return
+     */
+    @ApiOperation("生成厂商开户行信息到供应商")
+    @PostMapping("/copyManBankToGys")
+    @ResponseBody
+    public ResultBean copyManBankToGys(@RequestParam("orgSid") String orgSid);
+
 
     /**
      * 新增保存

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -35,6 +35,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean copyManBankToGys(String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean save(BaseManufacturerAllDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturer/save无法访问");

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java

@@ -24,6 +24,8 @@ import lombok.Data;
 public class BaseManufacturerBankVo implements Vo {
 
     private static final long serialVersionUID = 7902385526436803445L;
+    private String sid;
+
     @ApiModelProperty("国家")
     private String country;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -175,8 +175,8 @@ public interface BaseVehicleFeign {
      * @return
      */
     @ApiOperation("修改车辆台账备注")
-    @PostMapping("/updateVehRemarks/{remarks}/{sid}")
-    public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid);
+    @PostMapping("/updateVehRemarks")
+    public ResultBean updateVehRemarks(@RequestParam("remarks") String remarks, @RequestParam("sid") String sid);
     /***************************************************** PC现车接口 **********************************************************/
 
     /**

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -26,6 +26,8 @@ import java.util.Date;
 @Data
 public class BaseVehicleVo implements Vo {
 
+    @ApiModelProperty(value = "备注")
+    private String remarks;
     @ApiModelProperty(value = "车型与配置关联表sid")
     private String vehModelConfigSid;
     @ApiModelProperty(value = "车辆sid")
@@ -38,6 +40,8 @@ public class BaseVehicleVo implements Vo {
     private String configName;
     @ApiModelProperty("车架号(VIN)（陕汽必须的字段）")
     private String vinNo;
+    @ApiModelProperty("车架号后八位")
+    private String lastVinNo;
     @ApiModelProperty("车辆状态value值")
     private String vehicleStateValue;
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
@@ -102,8 +106,12 @@ public class BaseVehicleVo implements Vo {
     private String witPinStateValue;
     @ApiModelProperty(value = "合格证状态value")
     private String certificateStateValue;
-    @ApiModelProperty(value = "库龄")
+    @ApiModelProperty(value = "厂家库龄")
     private Long libraryAge;
+    @ApiModelProperty(value = "公司库龄")
+    private Long orgLibraryAge;
+    @ApiModelProperty(value = "买断库龄")
+    private Long settlementLibraryAge;
     @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
     private String isProblemVeh;
     @ApiModelProperty(value = "采购系统sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java

@@ -35,9 +35,9 @@ public class BaseVehicleBrandDto implements Dto {
     @NotBlank(message = "品牌名称不能为空")
     private String brandName;
 
-/*    @ApiModelProperty("品牌简称(品牌首字母，但不可重复)")
+    @ApiModelProperty("品牌简称(品牌首字母，但不可重复)")
     @NotBlank(message = "品牌简称")
-    private String brandShortName;*/
+    private String brandShortName;
 
     @ApiModelProperty(value = "品牌类型", required = true)
     @NotBlank(message = "品牌类型不能为空")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -119,4 +119,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<Map<String, String>> bankNamesDown(String manufacturerSid);
 
     List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
+
+    BaseManufacturer fetchByManBankSid(String s);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -168,4 +168,8 @@
     <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
         select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
     </select>
+
+    <select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
+        select * from base_manufacturer where manBankSid = #{s}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -67,6 +67,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean copyManBankToGys(String orgSid) {
+        return baseManufacturerService.copyManBankToGys(orgSid);
+    }
+
     @Override
     public ResultBean save(BaseManufacturerAllDto dto) {
         return baseManufacturerService.saveAll(dto);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basemanufacturer;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.*;
@@ -11,6 +12,7 @@ import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto
 import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -55,8 +57,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
     private BaseManufacturerBankService baseManufacturerBankService;//供应厂商开户行信息
     @Autowired
     private BaseManufacturerFinanceService baseManufacturerFinanceService;//供应厂商财务信息
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
     @Resource
     private FinKingDeeFeign finKingDeeFeign;
+
     /**
      * 供应厂商分页列表
      *
@@ -88,8 +93,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             }
         }
         qw.eq("bm.isDelete", 0);
-        qw.ne("bm.supplierType",0001);
-        qw.eq("bm.createOrg",params.getCreateOrgSid());
+        qw.ne("bm.supplierType", 0001);
+        qw.eq("bm.createOrg", params.getCreateOrgSid());
         return baseMapper.pagerList(page, qw);
     }
 
@@ -116,7 +121,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             }
         }
         qw.eq("isDelete", 0);
-        qw.eq("supplierType",0001);
+        qw.eq("supplierType", 0001);
         return qw;
     }
 
@@ -283,7 +288,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 return resultBean2;
             }
         }
-        BdSupplier bdSupplier=new BdSupplier();
+        BdSupplier bdSupplier = new BdSupplier();
         bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
         bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
         bdSupplier.setFUseOrgId("101");
@@ -396,15 +401,15 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         return rb.success().setMsg("修改成功");
     }
 
-    public ResultBean<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
+    public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<Map<String,String>> manufacturerNames = baseMapper.wcgysNamesDown(orgSid);
+        List<Map<String, String>> manufacturerNames = baseMapper.wcgysNamesDown(orgSid);
         return rb.success().setData(manufacturerNames);
     }
 
     public ResultBean<List<Map<String, String>>> bankNamesDown(String manufacturerSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
+        List<Map<String, String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
         return rb.success().setData(bankNames);
     }
 
@@ -412,7 +417,53 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
         String useOrgSid = query.getUseOrgSid();
         String supplierTypeValue = "主机厂";
-        List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue);
+        List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid, supplierTypeValue);
         return rb.success().setData(list);
     }
+
+    public ResultBean copyManBankToGys(String orgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = baseVehicleBrandService.selectManSidByOrgSid(orgSid);
+        for (String s : stringList) {
+            BaseManufacturer baseManufacturer = fetchBySid(s);
+            if (baseManufacturer != null) {
+                BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(s);
+                if (baseManufacturer2 != null) {
+                    String sid = baseManufacturer2.getSid();
+                    BeanUtil.copyProperties(baseManufacturer, baseManufacturer2);
+                    baseManufacturer2.setSid(sid);
+                    baseManufacturer2.setUseOrg(orgSid);
+                    baseManufacturer2.setManBankSid(baseManufacturer.getSid());
+                    saveOrUpdate(baseManufacturer2);
+                } else {
+                    BaseManufacturer baseManufacturer1 = new BaseManufacturer();
+                    String sid = baseManufacturer1.getSid();
+                    BeanUtil.copyProperties(baseManufacturer, baseManufacturer1);
+                    baseManufacturer1.setSid(sid);
+                    baseManufacturer1.setUseOrg(orgSid);
+                    baseManufacturer1.setManBankSid(baseManufacturer.getSid());
+                    save(baseManufacturer1);
+                }
+            }
+            List<BaseManufacturerBankVo> baseManufacturerBankVos = baseManufacturerBankService.selectDetails(s);
+            if (baseManufacturerBankVos.size() > 0) {
+                for (BaseManufacturerBankVo baseManufacturerBankVo : baseManufacturerBankVos) {
+                    BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(baseManufacturerBankVo.getSid());
+                    if (baseManufacturer2 != null) {
+                        baseManufacturer2.setManufacturerName(baseManufacturerBankVo.getAccountName());
+                        baseManufacturer2.setUseOrg(orgSid);
+                        baseManufacturer2.setManBankSid(baseManufacturerBankVo.getSid());
+                        saveOrUpdate(baseManufacturer2);
+                    } else {
+                        BaseManufacturer baseManufacturer1 = new BaseManufacturer();
+                        baseManufacturer1.setManufacturerName(baseManufacturerBankVo.getAccountName());
+                        baseManufacturer1.setUseOrg(orgSid);
+                        baseManufacturer1.setManBankSid(baseManufacturerBankVo.getSid());
+                        save(baseManufacturer1);
+                    }
+                }
+            }
+        }
+        return rb.success().setData(stringList);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -31,6 +31,7 @@
     <!--根据供应厂商sid查询开户行信息-->
     <select id="selectDetails" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
         SELECT
+        bmb.sid,
         <!--账户名称-->
         bmb.accountName,
         <!--银行账号-->
@@ -55,15 +56,15 @@
         bmb.remarks
         FROM base_manufacturer_bank bmb
         WHERE bmb.manufacturerSid = #{sid}
-          AND bmb.isDelete = 0
+        AND bmb.isDelete = 0
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bmb.bankAccount num, bmb.accountName name
         from base_manufacturer_bank bmb
-                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
-                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
-                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
+                     left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+                     left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+                     left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
           and bmb.dueBankKey = '2'
     </select>
@@ -73,7 +74,7 @@
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
-                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           AND bm.useOrg = #{useOrgSid}
           and bmb.dueBankKey = #{code}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -463,5 +463,5 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
 
     @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
-    ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
+    void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -103,6 +103,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         IPage<BaseVehicleVo> page = baseVehicleService.pagerList(pagerQuery);
         List<BaseVehicleVo> records = page.getRecords();
         for (BaseVehicleVo record : records) {
+            //厂家库龄
             if (record.getPriceDate() != null) {
                 Date priceDate = record.getPriceDate();
                 String today = DateUtil.today();
@@ -111,6 +112,28 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
                 record.setLibraryAge(betweenDay * i * -1);
             }
+            //公司库龄
+            if (record.getArrivalDate() != null) {
+                Date arrivalDate = record.getArrivalDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = arrivalDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(arrivalDate, currentDate, DateUnit.DAY);
+                record.setOrgLibraryAge(betweenDay * i * -1);
+            }
+            //买断库龄
+            if (record.getSolidDate() != null) {
+                Date solidDate = record.getSolidDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = solidDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
+                record.setSettlementLibraryAge(betweenDay * i * -1);
+            }
+            String vinNo = record.getVinNo();
+            if (StringUtils.isNotBlank(vinNo)){
+                record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
+            }
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2643,6 +2643,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
     public ResultBean updateVehRemarks(String remarks, String sid) {
-        return baseMapper.updateVehRemarks(remarks,sid);
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateVehRemarks(remarks,sid);
+        return rb.success().setMsg("备注修改成功");
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java

@@ -124,4 +124,7 @@ public interface BaseVehicleBrandMapper extends BaseMapper<BaseVehicleBrand> {
     String getBrandShortName(@Param("sid") String sid);
 
     List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(@Param("useOrg") String useOrg);
+
+    @Select("SELECT DISTINCT manufacturerSid FROM base_vehicle_brand WHERE useOrg LIKE %#{orgSid}%")
+    List<String> selectManSidByOrgSid(String orgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@@ -41,6 +41,7 @@
     <!--根据sid查询品牌详情-->
     <select id="selectBySid" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDetailsVo">
         SELECT bvb.brandName,
+               bvb.brandShortName,
                bvb.brandCode,
                bvb.brandType,
                bvb.brandTypeValue,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -229,4 +229,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
         List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(useOrg);
         return list;
     }
+
+    public List<String> selectManSidByOrgSid(String orgSid) {
+        return baseMapper.selectManSidByOrgSid(orgSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
@@ -483,6 +484,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){
             //车辆台账推送数据
             BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
+            BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderFeign.fetchBySid(booad.getVehicleOrderSid()).getData();
+            /*baseVehicleDto.setPurchaseSystemSid();
+            baseVehicleDto.setPurchaseSystemName();
+            baseVehicleDto.setManufSaleAccessSid();
+            baseVehicleDto.setManufSaleAccessName();*/
             baseVehicleDto.setVinNo(s.getVinNo());
             baseVehicleDto.setModelSid(booad.getModelSid());
             baseVehicleDto.setModelName(booad.getModelName());