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 62d1fe6cfb..d919d8936a 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 @@ -181,6 +181,10 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleReturnList") ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("采购退库更新状态") + @PostMapping("/updateByVinNo") + ResultBean updateByVinNo(@RequestBody BaseVehicleUpdateQuery baseVehicleUpdateQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java new file mode 100644 index 0000000000..8a9b2ee712 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/15 16:15 + * @Description + */ +@Data +public class BaseVehicleUpdateQuery implements Query { + + private static final long serialVersionUID = -8728015525907955689L; + + private List vinNoLis; + private String vehicleState; + private String vihicleStateValue; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 241a20fcb8..88911c2eae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -258,4 +259,6 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ IPage vehicleReturnPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + ResultBean updateByVinNo(@Param("vinNoList") List stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 42104fda6b..35e99a263a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -579,4 +579,13 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` ${ew.customSqlSegment} + + + update base_vehicle + set vehicleState = #{vehicleState} and vehicleStateValue = #{vehicleStateValue} + where vinNo in + + #{vinNo} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 2140affb58..2147e65324 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -303,6 +303,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) { + return baseVehicleService.updateByVinNo(baseVehicleUpdateQuery); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index b78626c874..810a079725 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -968,4 +968,11 @@ public class BaseVehicleService extends MybatisBaseService stringList = baseVehicleUpdateQuery.getVinNoLis(); + String vehicleState = baseVehicleUpdateQuery.getVehicleState(); + String vehicleStateValue = baseVehicleUpdateQuery.getVihicleStateValue(); + return baseMapper.updateByVinNo(stringList, vehicleState, vehicleStateValue); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 6018bd88aa..1c998756cc 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -15,7 +15,7 @@ public enum ProcDefEnum { ARREARSCARRYVEHICLE("欠款提车审批流程","arrears_carryvehicle:1:232589"), VEHICLEAPPLY("排产申请流程","process_9egcg169:1:242660"), RECORDAPPLICATION("入账申请","record_application_7y80d4r8:1:265008"), - SCMVEHICLERETURN("采购退库", "process_lcgh2q0g:4:235004"), + SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"), ; ProcDefEnum(String proDefName, String proDefId) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java index 532ed2d0a2..422dcc380e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java @@ -6,6 +6,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -20,18 +22,22 @@ public class ScmVehicleReturnDto implements Dto { @ApiModelProperty(value = "sid") private String sid; @ApiModelProperty(value = "申请编号") + @NotBlank(message = "申请编号不能为空") private String applicationCode; @ApiModelProperty(value = "申请人sid", required = true) + @NotBlank(message = "申请人不能为空") private String userSid; @ApiModelProperty(value = "申请人", required = true) + @NotBlank(message = "申请人不能为空") private String name; @ApiModelProperty(value = "申请日期", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty(value = "退库原因", required = true) + @NotBlank(message = "退库原因不能为空") private String reason; - @ApiModelProperty(value = "费用") + @ApiModelProperty(value = "费用", example = "0") private String money; @ApiModelProperty(value = "车辆列表") - private List detailsList; + private List detailsList = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java index 32e4f167f8..2ac7eaff42 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java @@ -34,6 +34,10 @@ public interface ScmVehicleReturnFeign { @ResponseBody ResultBean details(@RequestParam(value = "sid", required = false) String sid); + @ApiOperation("删除") + @DeleteMapping("/delete") + @ResponseBody + ResultBean delete(@RequestBody String[] sidsList); @ApiOperation("提交") @PostMapping("/submitVehicleReturn") @@ -42,18 +46,22 @@ public interface ScmVehicleReturnFeign { @ApiOperation(value = "办理(同意)") @PostMapping("/complete") + @ResponseBody public ResultBean complete(@RequestBody ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery); @ApiOperation(value = "驳回任务") @PostMapping("/reject") + @ResponseBody ResultBean reject(@RequestBody ScmVehicleReturnFlowDto dto); @ApiOperation(value = "终止任务") @PostMapping("/breakProcess") + @ResponseBody ResultBean breakProcess(@RequestBody ScmVehicleReturnFlowDto dto); @ApiOperation(value = "撤回任务") @PostMapping("/revokeProcess") + @ResponseBody ResultBean revokeProcess(@RequestBody ScmVehicleReturnFlowDto dto); } diff --git a/anrui-scm/anrui-scm-biz/pom.xml b/anrui-scm/anrui-scm-biz/pom.xml index fcef21a4c8..852ea35547 100644 --- a/anrui-scm/anrui-scm-biz/pom.xml +++ b/anrui-scm/anrui-scm-biz/pom.xml @@ -65,6 +65,12 @@ com.yxt.anrui 0.0.1 + + com.yxt.anrui + anrui-base-api + 0.0.1 + compile + diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java index cd3787d0bc..f531b7be5f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java @@ -48,7 +48,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.scm" }) -@EnableFeignClients(basePackages = {"com.yxt.anrui.buscenter", "com.yxt.anrui.portal","com.yxt.anrui.flowable"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.buscenter", "com.yxt.anrui.portal","com.yxt.anrui.flowable","com.yxt.anrui.base"}) public class AnruiScmApplication { public static void main(String[] args) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java index dd1523dec4..ffcaebc06a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java @@ -39,6 +39,11 @@ public class ScmVehicleReturnRest implements ScmVehicleReturnFeign { return scmVehicleReturnService.details(sid); } + @Override + public ResultBean delete(String[] sidsList) { + return scmVehicleReturnService.delete(sidsList); + } + @Override public ResultBean submitVehicleReturn(ScmVehicleReturnDto scmVehicleReturnDto) { return scmVehicleReturnService.submitVehicleReturn(scmVehicleReturnDto); 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 064456ea81..4aa2d07ab7 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 @@ -5,6 +5,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -58,6 +60,8 @@ public class ScmVehicleReturnService extends MybatisBaseService variables = new HashMap<>(); variables.put("businessSid", businessSid); - variables.put("isLoan", true); + if (Integer.parseInt(scmVehicleReturnDto.getMoney()) > 0) { + variables.put("isLoan", true); + } else { + variables.put("isLoan", false); + } variables.put("orgSid", orgSid);//部门sid ResultBean businessResultBean = flowableFeign.businessStart(ProcDefEnum.SCMVEHICLERETURN.getProDefId(), scmVehicleReturnDto.getUserSid(), variables); if (businessResultBean.getSuccess() && businessResultBean.getData() != null) { @@ -191,9 +209,11 @@ public class ScmVehicleReturnService extends MybatisBaseService> vinNoList = scmVehicleReturnDetailsService.selectVinNoList(scmVehicleReturnFlowQuery.getBusinessSid()); + if (vinNoList.getSuccess() && vinNoList.getData() != null && vinNoList.getData().size() != 0) { + String vehicleState = "0006"; + String vehicleStateValue = "采购退库中"; + BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery(); + baseVehicleUpdateQuery.setVehicleState(vehicleState); + baseVehicleUpdateQuery.setVihicleStateValue(vehicleStateValue); + baseVehicleUpdateQuery.setVinNoLis(vinNoList.getData()); + baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery); + } + + } } map.put("nodeState", nodeState); @@ -347,4 +381,11 @@ public class ScmVehicleReturnService extends MybatisBaseService detailsList(String sid) { return baseMapper.detailsList(sid); } + + public void deleteByReturnSid(String[] sidsList) { + List stringList = Arrays.asList(sidsList); + for (int i = 0; i < stringList.size(); i++) { + baseMapper.deleteByReturnSid(stringList.get(i)); + } + + } }