欠款提车

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -123,8 +123,8 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean completeBy(@RequestBody CompleteByQuery query);
 
-    @ApiOperation(value = "办理（同意）")
+    @ApiOperation(value = "跨事业部办理（同意）")
-    @PostMapping("/InitiatorToAnswerInfo")
+    @PostMapping("/initiatorToAnswerInfo")
     @ResponseBody
     public ResultBean InitiatorToAnswerInfo(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java

@@ -5,8 +5,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 public class BusArrearsCarryVehicleApplyPageVo implements Vo {
 
@@ -42,4 +40,10 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo {
     @ApiModelProperty("申请人")
     private String applyName;
 
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java

@@ -41,6 +41,8 @@ public class BusArrearsCarryVehicleDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
 
+    private String vinSid;
+
 
 }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -23,7 +23,9 @@
         <!-- 申请日期 -->
         DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate,
         <!-- 申请人 -->
-        bacva.applyName
+        bacva.applyName,
+        bacva.procDefId,
+        bacva.procInstId
         FROM bus_arrears_carry_vehicle_apply bacva
         <where>
             ${ew.sqlSegment}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -1613,7 +1613,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         baseVehicleTempstateDto.setTempValue("待审核");
         List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
         for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
-            baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid());
+            baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVinSid());
             baseVehicleTempstateDto.setVinNo(busArrearsCarryVehicleDetailsVo.getVinNo());
             baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
         }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -17,7 +17,7 @@ public enum ProcDefEnum {
     QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:1:1202504"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),