Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java

@@ -25,19 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
-import com.yxt.anrui.base.api.baseoutsourcingapplication.BusinessVariablesDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
-import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyTaskQuery;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -91,14 +87,29 @@ public interface BaseInternalPurchaseFeign {
     @PostMapping("/submitBaseInternalPurchase")
     public ResultBean submitBaseInternalPurchase(@Valid @RequestBody SubmitBaseInterNalPurchaseDto dto);
 
+    /**
+     * 申请方审批同意、应对方审批同意（除申请方最后一个环节）
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/complete")
     public ResultBean complete(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
 
+    /**
+     * 申请方跳应对方的同意
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/InitiatorToAnswer")
     public ResultBean InitiatorToAnswer(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
 
+    /**
+     * 分公司到事业部同意
+     * @param bvd
+     * @return
+     */
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/companyToDivisionOperate")
     public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);

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

@@ -44,4 +44,11 @@ public class BaseVehicleActualVo implements Vo {
     @ApiModelProperty(value = "入库价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String priced;
+
+    @ApiModelProperty("与该内部编码一致的车辆")
+    private int vehicleNum;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java

@@ -24,4 +24,11 @@ public class BaseVehicleActualDetails extends BaseEntity {
     private Date inboundDate;
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java

@@ -24,4 +24,11 @@ public class BaseVehicleActualDetailsDto implements Dto {
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
 
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java

@@ -22,4 +22,11 @@ public class BaseVehicleActualDetailsVo implements Vo {
     private String inboundDate;
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty("库龄")
+    private int dayNum;
+    @ApiModelProperty("车辆数量")
+    private int vehicleNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java

@@ -31,4 +31,7 @@ public class AppBaseVehicleActualSalesVo implements Vo {
     private String reason;
 
     private List<AppBaseVehicleActualDetailsVo> records;
+
+    @ApiModelProperty("未售买断费用")
+    private String money;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -26,6 +26,8 @@ public class BaseVehicleActualSales extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("未售买断费用")
+    private String money;
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -32,4 +32,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty(value = "实例id")
     private String procInstId;
+
+    @ApiModelProperty("未售买断费用")
+    private String money;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -34,5 +34,8 @@ public class BaseVehicleActualSalesDto implements Dto {
     @ApiModelProperty(value = "车辆列表")
     private List<BaseVehicleActualDetailsDto> detailsList;
 
+    @ApiModelProperty("未售买断费用")
+    private String money;
+
 
 }

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

@@ -755,7 +755,11 @@
         bmc.configName,
         bmc.sid as configSid,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
-        bv.costPrice as priced
+        bv.costPrice as priced,
+        bv.insideCode,
+        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum,
+        (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
+
         FROM base_vehicle bv
         LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
         LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -14,7 +14,14 @@
     </delete>
 
     <select id="detailsList" resultType="com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo">
-        select sid, vinNo, modelName, DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate, inboundPrice
+        select sid,
+               vinNo,
+               modelName,
+               DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate,
+               inboundPrice,
+               insideCode,
+               vehicleNum,
+               dayNum
         from base_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </select>
@@ -37,7 +44,7 @@
                DATE_FORMAT(bd.inboundDate, '%Y-%m-%d') as inboundDate,
                bd.inboundPrice,
                bv.modelSid,
-               bv.modelConfigSid as configSid
+               bv.modelConfigSid                       as configSid
         from base_vehicle_actual_details bd
                  left join base_vehicle bv on bv.vinNo = bd.vinNo
         where bd.vehicleActualSid = #{sid}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml

@@ -22,7 +22,8 @@
                applicationName,
                taskId,
                procInstId,
-               createBySid                            userSid
+               createBySid                            userSid,
+               money
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>
@@ -57,7 +58,8 @@
                procInstId                          as procInsId,
                applicationName                     as applyName,
                DATE_FORMAT(createTime, '%Y-%m-%d') as date,
-               reason
+               reason,
+               money
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>

anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue

@@ -262,6 +262,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.temp = {}
+      this.useOrgValue = ''
       this.useOrgArry = []
       //  this.$router.go(-1)
       this.$emit('doback')

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue

@@ -87,7 +87,8 @@ export default {
         sid: '', // 一条数据的sid
         vehicleAlias: '', // 车型名称(产品名称 陕汽必须1)
         manufactorSettlementPrice: '', // 厂家结算价
-        guidedPrice: '' // 销售指导价
+        guidedPrice: '', // 销售指导价
+        insideCode:''
       },
       rules: {
         manufactorSettlementPrice: [{ required: true, message: '销售指导价(贷款)不能为空', trigger: 'blur' }],
@@ -122,7 +123,8 @@ export default {
           const temp = {
             sid: this.temp.sid,
             manufactorSettlementPrice: this.temp.manufactorSettlementPrice,
-            guidedPrice: this.temp.guidedPrice
+            guidedPrice: this.temp.guidedPrice,
+            insideCode: this.temp.insideCode
           }
           update(temp).then(resp => {
             if (resp.success) {

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@@ -112,7 +112,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>临牌</span>
+            <span>临牌牌照号</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue

@@ -101,7 +101,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>临牌</span>
+            <span>临牌牌照号</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@@ -107,7 +107,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>临牌</span>
+            <span>临牌牌照号</span>
           </el-col>
           <el-col :span="9">
             <el-input v-model="temp.temporaryCard" maxlength="125" placeholder="" class="addinputw" clearable/>

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue

@@ -101,7 +101,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>临牌</span>
+            <span>临牌牌照号</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>