diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVeh.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVeh.java index 4d01cf17c3..e6aba0ba91 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVeh.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVeh.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(厂家退库)
* File: BaseManufacturerRetwareVeh.java
@@ -58,5 +60,9 @@ public class BaseManufacturerRetwareVeh extends BaseEntity { private String manApprovalType; // 厂家审批结果(0成功，1失败) @ApiModelProperty("退款金额") private String refundMoney; // 退款金额 + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("厂家扣款说明") + private String manDeduRemarks; // 厂家扣款说明 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDetailsVo.java index 783d7577c1..631e6f3f9b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDetailsVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -61,6 +62,10 @@ public class BaseManufacturerRetwareVehDetailsVo implements Vo { private String manApprovalType; // 厂家审批结果(0成功，1失败) @ApiModelProperty("退款金额") private String refundMoney; // 退款金额 + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("厂家扣款说明") + private String manDeduRemarks; // 厂家扣款说明 @ApiModelProperty("图片全路径") private List urls; // 图片全路径 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDto.java index a00a859571..ef4aab0ae0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(厂家退库)
* File: BaseManufacturerRetwareVehDto.java
@@ -59,5 +61,9 @@ public class BaseManufacturerRetwareVehDto implements Dto { private String manApprovalType; // 厂家审批结果(0成功，1失败) @ApiModelProperty("退款金额") private String refundMoney; // 退款金额 + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("厂家扣款说明") + private String manDeduRemarks; // 厂家扣款说明 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehVo.java index fe59070b59..054fb07eaf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(厂家退库)
* File: BaseManufacturerRetwareVehVo.java
@@ -59,5 +61,8 @@ public class BaseManufacturerRetwareVehVo implements Vo { private String manApprovalType; // 厂家审批结果(0成功，1失败) @ApiModelProperty("退款金额") private String refundMoney; // 退款金额 - + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("厂家扣款说明") + private String manDeduRemarks; // 厂家扣款说明 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 1cb7b9085f..500e552888 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -361,4 +361,8 @@ public interface BaseVehicleFeign { @ApiOperation("根据用户sid 获取库存车辆信息") @GetMapping("/selectInventoryRecords/{userSid}") public ResultBean> selectInventoryRecords(@PathVariable("userSid") String userSid); + + @ApiOperation("根据车架号和分公司sid查询车辆信息") + @PostMapping("/selectByVinNoAndOrgSid") + ResultBean selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo,@RequestParam("createOrgSid") String createOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index cf3f815664..ab03702f1a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -276,4 +276,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selectByVinNoAndOrgSid(String vinNo, String createOrgSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java index f39aab1ea4..8d768439ef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java @@ -32,4 +32,6 @@ public class BaseVehmodelConfigVos implements Vo { private String configCode; @ApiModelProperty(value = "库存数量") private Integer num; + @ApiModelProperty(value = "内部编码") + private String insideCode; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index c6d53658e5..31ad3c8a66 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -105,6 +105,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService= date_format('" + appluStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(appluEndDate), "date_format (appluDate,'%Y-%m-%d') <= date_format('" + appluEndDate + "','%Y-%m-%d')" ); + qw.orderByDesc("appluDate"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); List records = pagging.getRecords(); @@ -134,6 +135,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService fetchByMainSid(String sid); - @Update("update base_manufacturer_retware_veh set manApprovalType = #{manApprovalType},refundMoney = #{refundMoney} where vinNo = #{vinNo}") - int updateByVinNo(@Param("manApprovalType") String manApprovalType,@Param("refundMoney") String refundMoney,@Param("vinNo") String vinNo); + @Update("update base_manufacturer_retware_veh set manApprovalType = #{manApprovalType},refundMoney = #{refundMoney},manDeduRemarks = #{manDeduRemarks} where vinNo = #{vinNo}") + int updateByVinNo(@Param("manApprovalType") String manApprovalType,@Param("refundMoney") String refundMoney,@Param("vinNo") String vinNo,@Param("manDeduRemarks") String manDeduRemarks); @Select("select manApprovalType from base_manufacturer_retware_veh where vinNo = #{vinNo}") String fetchByVinNo(String vinNo); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java index 58f4562c8b..8dc1006506 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java @@ -139,8 +139,8 @@ public class BaseManufacturerRetwareVehService extends MybatisBaseService selectByVinNoAndOrgSid(String vinNo, String createOrgSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, createOrgSid); + return rb.success().setData(baseVehicle); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 7c8cad92cf..b7b94d1f8b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -305,7 +305,8 @@ bvc.`guidedPrice`, bvm.vehicleTypeCode, bmc.configCode, - bvc.manufactorSettlementPrice + bvc.manufactorSettlementPrice, + bvc.insideCode FROM base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index d2802bc796..d729f15970 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign; import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto; +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.basevehicle.BaseVehicleUpdateQuery; @@ -343,7 +344,11 @@ public class ScmVehicleReturnService extends MybatisBaseServicebaseManufacturerRetwareVehs.add(new BaseManufacturerRetwareVehDto())); for(int i=0;i baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, booad.getCreateOrgSid()); + BaseVehicle baseVehicle = baseVehicleResultBean.getData(); + baseManufacturerRetwareVehDto.setCostPrice(new BigDecimal(baseVehicle.getCostPrice().toString())); baseManufacturerRetwareVehs.add(baseManufacturerRetwareVehDto); } brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;