17 changed files with 478 additions and 25 deletions
@ -0,0 +1,43 @@ |
|||
package com.yxt.anrui.terminal.api.supplychain.companyShunting; |
|||
|
|||
import com.yxt.common.core.dto.Dto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:43 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class CompanyShuntingDto implements Dto { |
|||
private static final long serialVersionUID = -1526555701754422925L; |
|||
|
|||
@ApiModelProperty(value = "用户sid") |
|||
@NotBlank(message = "参数错误：userSid") |
|||
private String userSid; |
|||
@ApiModelProperty(value = "用户全路径sid") |
|||
@NotBlank(message = "参数错误：orgSidPath") |
|||
private String orgSidPath; |
|||
@ApiModelProperty(value = "节点id") |
|||
@NotBlank(message = "参数错误：taskDefKey") |
|||
private String taskDefKey; |
|||
@ApiModelProperty(value = "任务id") |
|||
@NotBlank(message = "参数错误：taskId") |
|||
private String taskId; |
|||
@ApiModelProperty(value = "流程id") |
|||
@NotBlank(message = "参数错误：instanceId") |
|||
private String instanceId; |
|||
@ApiModelProperty(value = "意见") |
|||
@NotBlank(message = "参数错误：comment") |
|||
private String comment; |
|||
@ApiModelProperty(value = "业务sid") |
|||
@NotBlank(message = "参数错误：businessSid") |
|||
private String businessSid; |
|||
private List<CompanyShuntingList> json; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.yxt.anrui.terminal.api.supplychain.companyShunting; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:29 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class CompanyShuntingList implements Vo { |
|||
private static final long serialVersionUID = 7979018402791508819L; |
|||
|
|||
@ApiModelProperty("sid") |
|||
private String sid; |
|||
|
|||
@ApiModelProperty("车型sid") |
|||
private String modelSid; |
|||
|
|||
@ApiModelProperty("配置sid") |
|||
private String configSid; |
|||
|
|||
@ApiModelProperty("车型名称") |
|||
@JsonProperty("modelName") |
|||
private String vehicleAlias; |
|||
|
|||
@ApiModelProperty("车架号") |
|||
@JsonProperty("vin") |
|||
private String vinNo; |
|||
|
|||
@ApiModelProperty("销售指导价") |
|||
@JsonProperty("guidancePrice") |
|||
private String guidedPrice; |
|||
|
|||
@ApiModelProperty("库存地点") |
|||
@JsonProperty("address") |
|||
private String inventoryLocationName; |
|||
|
|||
@ApiModelProperty("内销价格") |
|||
@JsonProperty("domesticPrice") |
|||
private String witPinMoney; |
|||
|
|||
@ApiModelProperty("运费") |
|||
@JsonProperty("fare") |
|||
private String freight; |
|||
|
|||
@ApiModelProperty("运费承担方") |
|||
@JsonProperty("freightPayer") |
|||
private String freightUndertakerName; |
|||
|
|||
@ApiModelProperty("备注") |
|||
private String remarks; |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
package com.yxt.anrui.terminal.api.supplychain.companyShunting; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:48 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class CompanyShuntingQuery implements Query { |
|||
private static final long serialVersionUID = 5168595226107955454L; |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.yxt.anrui.terminal.api.supplychain.companyShunting; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:47 |
|||
* @Description |
|||
*/ |
|||
@Data |
|||
public class CompanyShuntingTaskQuery implements Query { |
|||
private static final long serialVersionUID = -8199630188033418050L; |
|||
|
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("任务Id") |
|||
@NotBlank(message = "参数错误：taskId") |
|||
private String taskId; |
|||
/** |
|||
* 终止、驳回、撤回 |
|||
*/ |
|||
@ApiModelProperty("业务sid") |
|||
@NotBlank(message = "参数错误：businessSid") |
|||
private String businessSid; |
|||
/** |
|||
* 终止、驳回 |
|||
*/ |
|||
@ApiModelProperty("任务意见") |
|||
private String comment; |
|||
/** |
|||
* 终止、撤回 |
|||
*/ |
|||
@ApiModelProperty("用户Sid") |
|||
private String userSid; |
|||
/** |
|||
* 终止 |
|||
*/ |
|||
@ApiModelProperty("流程实例Id") |
|||
private String instanceId; |
|||
} |
|||
@ -0,0 +1,67 @@ |
|||
package com.yxt.anrui.terminal.biz.supplychain.companyShunting; |
|||
|
|||
import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import io.swagger.annotations.Api; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Controller; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:31 |
|||
* @Description |
|||
*/ |
|||
@Api(tags = "分公司间调车") |
|||
@Controller |
|||
@RequestMapping("/supplychain/v1/companyShunting") |
|||
public class CompanyShuntingRest implements CompanyShuntingFeign { |
|||
|
|||
@Autowired |
|||
private CompanyShuntingService companyShuntingService; |
|||
|
|||
@Override |
|||
public ResultBean<CompanyShuntingVo> getCompanyShunting(String sid) { |
|||
return companyShuntingService.getCompanyShunting(sid); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean agreeCompanyShuntingInfo(CompanyShuntingDto dto) { |
|||
return companyShuntingService.agreeCompanyShuntingInfo(dto); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) { |
|||
return companyShuntingService.upDateAgreeCompanyShuntingInfo(dto); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean initiatorToAnswerInfo(CompanyShuntingDto dto) { |
|||
return companyShuntingService.initiatorToAnswerInfo(dto); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean companyToDivisionOperateInfo(CompanyShuntingDto dto) { |
|||
return companyShuntingService.companyToDivisionOperateInfo(dto); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean rejectCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
return companyShuntingService.rejectCompanyShuntingInfo(query); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean recallCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
return companyShuntingService.recallCompanyShuntingInfo(query); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean stopCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
return companyShuntingService.stopCompanyShuntingInfo(query); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean<String> getFlowOperateTitle(CompanyShuntingQuery query) { |
|||
return companyShuntingService.getFlowOperateTitle(query); |
|||
} |
|||
} |
|||
@ -0,0 +1,134 @@ |
|||
package com.yxt.anrui.terminal.biz.supplychain.companyShunting; |
|||
|
|||
import cn.hutool.core.bean.BeanUtil; |
|||
import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo; |
|||
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; |
|||
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto; |
|||
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery; |
|||
import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.HashMap; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.stream.Collectors; |
|||
|
|||
/** |
|||
* @Author dimengzhe |
|||
* @Date 2022/8/25 11:32 |
|||
* @Description |
|||
*/ |
|||
@Service |
|||
public class CompanyShuntingService { |
|||
|
|||
@Autowired |
|||
private BaseInternalPurchaseFeign baseInternalPurchaseFeign; |
|||
|
|||
public ResultBean<CompanyShuntingVo> getCompanyShunting(String sid) { |
|||
ResultBean<CompanyShuntingVo> rb = ResultBean.fireFail(); |
|||
ResultBean<AppCompanyShuntingVo> resultBean = baseInternalPurchaseFeign.getCompanyShunting(sid); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
CompanyShuntingVo companyShuntingVo = new CompanyShuntingVo(); |
|||
AppCompanyShuntingVo vo = resultBean.getData(); |
|||
BeanUtil.copyProperties(vo, companyShuntingVo); |
|||
return rb.success().setData(companyShuntingVo); |
|||
} |
|||
|
|||
public ResultBean agreeCompanyShuntingInfo(CompanyShuntingDto dto) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); |
|||
BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
List<CompanyShuntingList> list = dto.getJson(); |
|||
if (list.isEmpty()) { |
|||
return rb.setMsg("车辆list不能为空"); |
|||
} |
|||
List<Map<String, Object>> dataList = list.stream().map(companyShuting -> { |
|||
Map<String, Object> map = new HashMap<>(); |
|||
map.put("sid", companyShuting.getSid()); |
|||
map.put("guidedPrice", companyShuting.getGuidedPrice()); |
|||
return map; |
|||
}).collect(Collectors.toList()); |
|||
Map<String, Object> map = new HashMap<>(); |
|||
BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); |
|||
BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); |
|||
map.put("baseInternalPurchaseVehicles", dataList); |
|||
baseInterNalPurchaseCompleteDto.setFormVariables(map); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean initiatorToAnswerInfo(CompanyShuntingDto dto) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); |
|||
BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.InitiatorToAnswer(baseInterNalPurchaseCompleteDto); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean companyToDivisionOperateInfo(CompanyShuntingDto dto) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); |
|||
BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.companyToDivisionOperate(baseInterNalPurchaseCompleteDto); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean rejectCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); |
|||
BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.taskReject(baseInterNalPurchaseTaskQuery); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean recallCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); |
|||
BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.revokeProcess(baseInterNalPurchaseTaskQuery); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean stopCompanyShuntingInfo(CompanyShuntingTaskQuery query) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); |
|||
BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); |
|||
ResultBean resultBean = baseInternalPurchaseFeign.breakProcess(baseInterNalPurchaseTaskQuery); |
|||
if (!resultBean.getSuccess()) { |
|||
return rb.setMsg(resultBean.getMsg()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean<String> getFlowOperateTitle(CompanyShuntingQuery query) { |
|||
return null; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue