更改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.util.Date;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApply.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApply <br/>
- * Description: 车辆交回事前报备申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆交回事前报备申请", description = "车辆交回事前报备申请")
 @TableName("loan_restore_report_apply")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java

@@ -25,26 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-scm(车辆入库单查询) <br/>
- * File: ScmApplyInboundVehQuery.java <br/>
- * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery <br/>
- * Description: 车辆入库单车辆查询. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-01-28 15:55:31 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 public class ScmApplyInboundVehQueryMaterial {
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -206,8 +206,16 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
             id = id + 1;
             BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney());
             tPrice = tPrice.add(settleMoney);
+            if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 2).equals("SZ")) {
+                //上装物料编码
+                scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 10));
+            } else if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 1).equals("G")) {
+                //挂车物料编码
+                scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 9));
+            } else {
                 //主车物料编码
                 scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
+            }
             scmApplyInboundVehQueryMaterial.setId(String.valueOf(id));
             scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName());
             scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
@@ -246,12 +254,12 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
         pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
         String downNum = scmApplyInboundQuery.getDownNum();
-        if (StringUtils.isBlank(downNum)){
+        if (StringUtils.isBlank(downNum)) {
             downNum = "1";
-        }else {
+        } else {
             downNum = String.valueOf((Integer.parseInt(downNum) + 1));
         }
-        baseMapper.updateDown(cgrkdSid,downNum);
+        baseMapper.updateDown(cgrkdSid, downNum);
         return rb.success().setData(pdfPath);
     }