问题修改

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(厂家退库) <br/>
  * File: BaseManufacturerRetwareVeh.java <br/>
@@ -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; // 厂家扣款说明
 
 }

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<String> urls; // 图片全路径
 }

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(厂家退库) <br/>
  * File: BaseManufacturerRetwareVehDto.java <br/>
@@ -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; // 厂家扣款说明
 
 }

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(厂家退库) <br/>
  * File: BaseManufacturerRetwareVehVo.java <br/>
@@ -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; // 厂家扣款说明
 }

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<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("根据车架号和分公司sid查询车辆信息")
+    @PostMapping("/selectByVinNoAndOrgSid")
+    ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo,@RequestParam("createOrgSid") String createOrgSid);
 }

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<BaseVehicle> selectByVinNoAndOrgSid(String vinNo, String createOrgSid) {
+        return null;
+    }
+
 }

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;
 }

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<BaseManuf
         qw.apply(StringUtils.isNotEmpty(appluStartDate), "date_format (appluDate,'%Y-%m-%d') >= 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<BaseManufacturerRetware> page = PagerUtil.queryToPage(pq);
         IPage<BaseManufacturerRetwareVo> pagging = baseMapper.selectPageVo(page, qw);
         List<BaseManufacturerRetwareVo> records = pagging.getRecords();
@@ -134,6 +135,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
             String billNo = getApplyCode(dto);
             baseManufacturerRetware.setApplyNo(billNo);
             baseManufacturerRetware.setAppluDate(DateUtil.today());
+            baseManufacturerRetware.setState(0);
             save(baseManufacturerRetware);
             for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
                 BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
@@ -244,13 +246,14 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         if (manApprovalType.equals("成功")){
             baseVehicle.setVehicleState(VehicleState.StockEnum.RETURN_STOCK.getCode());
             baseVehicle.setVehicleStateValue(VehicleState.StockEnum.RETURN_STOCK.getRemarks());
+            baseVehicle.setReturnDate(DateUtil.parseDate(DateUtil.today()));
             baseVehicleService.updateVeh(baseVehicle);
-            baseManufacturerRetwareVehService.updateByVinNo(manApprovalType,refundMoney,vinNo);
+            baseManufacturerRetwareVehService.updateByVinNo(manApprovalType,refundMoney,vinNo,dto.getManDeduRemarks());
         }else if (manApprovalType.equals("失败")){
             baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
             baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
             baseVehicleService.updateVeh(baseVehicle);
-            baseManufacturerRetwareVehService.updateByVinNo(manApprovalType,refundMoney,vinNo);
+            baseManufacturerRetwareVehService.updateByVinNo(manApprovalType,refundMoney,vinNo,dto.getManDeduRemarks());
         }
         int i = baseManufacturerRetwareVehService.fetchUNConfirmCountByMainSid(mainSid);
         if (i == 0){

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.java

@@ -68,8 +68,8 @@ public interface BaseManufacturerRetwareVehMapper extends BaseMapper<BaseManufac
 	@Select("select * from base_manufacturer_retware_veh where mainSid = #{sid}")
 	List<BaseManufacturerRetwareVehDetailsVo> 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);

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<BaseMa
 		return baseManufacturerRetwareVehDetailsVos;
 	}
 
-	public int updateByVinNo(String manApprovalType, String refundMoney, String vinNo) {
-		return baseMapper.updateByVinNo(manApprovalType,refundMoney,vinNo);
+	public int updateByVinNo(String manApprovalType, String refundMoney, String vinNo,String manDeduRemarks) {
+		return baseMapper.updateByVinNo(manApprovalType,refundMoney,vinNo,manDeduRemarks);
 	}
 
 	public String fetchByVinNo(String vinNo) {

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

@@ -754,5 +754,12 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.selectInventoryRecords(userSid);
     }
 
+    @Override
+    public ResultBean<BaseVehicle> selectByVinNoAndOrgSid(String vinNo, String createOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, createOrgSid);
+        return rb.success().setData(baseVehicle);
+    }
+
 
 }

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

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 MybatisBaseService<ScmVehicleReturn
                 //detailsList.forEach(item->baseManufacturerRetwareVehs.add(new BaseManufacturerRetwareVehDto()));
                 for(int i=0;i<detailsList.size();i++){
                     BaseManufacturerRetwareVehDto baseManufacturerRetwareVehDto = new BaseManufacturerRetwareVehDto();
-                    baseManufacturerRetwareVehDto.setVinNo(detailsList.get(i).getVinNo());
+                    String vinNo = detailsList.get(i).getVinNo();
+                    baseManufacturerRetwareVehDto.setVinNo(vinNo);
+                    ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, booad.getCreateOrgSid());
+                    BaseVehicle baseVehicle = baseVehicleResultBean.getData();
+                    baseManufacturerRetwareVehDto.setCostPrice(new BigDecimal(baseVehicle.getCostPrice().toString()));
                     baseManufacturerRetwareVehs.add(baseManufacturerRetwareVehDto);
                 }
                 brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;