yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

验车重复判断修改 

垫款申请导入优化
出库开票挂车开票金额获取修改
旧件处理调整
master
God 1 year ago
parent
d744d4d511
commit
b450291755
7 changed files with 45 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
  2. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  3. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java
  4. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  5. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  6. 7
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
  7. 7
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
View File

@ -176,7 +176,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
busBillTrailer.setBillTypeKey(busBillVehicle.getBillTypeKey());
busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
busBillTrailer.setOneBillMoney(new BigDecimal(trailerVo.getDealPrice()));
busBillTrailerService.save(busBillTrailer);
}
}
@ -282,7 +282,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
busBillTrailer.setOpenTickSid(busBillVehicle.getOpenTickSid());
busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
busBillTrailer.setOneBillMoney(new BigDecimal(busBillTrailerDto.getOneBillMoney()));
}
}
busBillTrailerService.save(busBillTrailer);

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
View File

@ -468,8 +468,15 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
Sheet sheet = wb.getSheetAt(0);
ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
resultList = importReturn.getInfos();
String msg = "平台中不存在的资方合同编号:";
for (BePadsincereExcelInfo bePadsincereExcelInfo : resultList) {
List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo());
if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) {
if (StringUtils.isNotBlank(bePadsincereExcelInfo.getBankContractNo())) {
msg = msg + bePadsincereExcelInfo.getBankContractNo() + ",";
continue;
}
}
for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) {
LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo();
loanBePadsincereVehDetailsVo.setVinNo(loanRepaymentScheduleDetailsVo.getVinNo());
@ -498,6 +505,10 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
}
if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
return rb.setMsg(importReturn.getCheckInfo());
} else if (!msg.equals("平台中不存在的资方合同编号:")) {
int lastIndex = msg.length() - 1;
msg = msg.substring(0, lastIndex) + "。";
return rb.success().setData(resultList2).setMsg(msg + "成功导入数据，请点击确定按钮");
} else {
return rb.success().setData(resultList2).setMsg("成功导入数据，请点击确定按钮");
}
@ -645,13 +656,6 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
checkWord.add("资方收款账号不能为空");
break;
}
List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(excelInfo.getBankContractNo());
if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) {
if (StringUtils.isNotBlank(excelInfo.getBankContractNo())) {
checkWord.add("资方合同号" + excelInfo.getBankContractNo() + "在还款计划表中不存在");
break;
}
}
}
}
StringBuffer sbcheck1 = new StringBuffer();

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java
View File

@ -105,7 +105,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
@Select("SELECT count(*) FROM scm_vehicle_examine WHERE useOrgSid = #{useOrgSid} and inspectionResult = '1' ")
int getToDoNum(@Param("useOrgSid") String useOrgSid);
@Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ")
int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath);
@Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid} AND inspectionResult = 1")

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
View File

@ -118,4 +118,17 @@
</where>
ORDER BY id DESC
</select>
<select id="getCountByVinNo" resultType="int">
SELECT
COUNT(*)
FROM
scm_vehicle_examine se
LEFT JOIN anrui_base.`base_vehicle` bv
ON bv.vinNo = se.vinNo
WHERE se.vinNo LIKE CONCAT('%', #{vinNo}, '%')
AND se.useOrgSid = #{orgPath}
AND se.inspectionResult = '2'
AND bv.vehicleState != '0004'
</select>
</mapper>

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -546,12 +546,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
if (StringUtils.isBlank(dto.getInboundDate())) {
return rb.setMsg("厂家入库日期不能为空");
}
if (StringUtils.isNotBlank(dto.getVin())){
if (StringUtils.isNotBlank(dto.getVin())) {
String vinNo = dto.getVin();
vinNo = vinNo.trim();
vinNo = vinNo.replace(" ", "");
if (vinNo.length() != 17) {
if (vinNo.length() != 8){
if (vinNo.length() != 8) {
return new ResultBean().fail().setMsg(dto.getVin() + "车架号输入不正确");
}
}
@ -659,16 +659,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
orgName = sysOrganizationVo.getName();
}
String vinNo = dto.getVin();
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, orgSid).getData();
if (baseVehicle != null) {
if ("001".equals(baseVehicle.getManPurOrderTypeKey())){
int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
if (countByVinNo > 0) {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}
}else {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}
int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
if (countByVinNo > 0) {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();

7
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
View File

@ -59,12 +59,19 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid")
private String createDeptSid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")

7
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
View File

@ -58,12 +58,19 @@ public class AsOldparthandleApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid")
private String createDeptSid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")

Write Preview
Loading…
Cancel
Save