diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java index f9fccb9623..86c77cd67c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java @@ -63,5 +63,6 @@ public class BaseInternalPurchaseQuery implements Query { private String shuntingTypeKey; // 调车类型key @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index a693e808bd..3bdd23e802 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -121,8 +121,10 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty("返利3") private String rebate3; - @ApiModelProperty("结算状态 实销 1/买断 2") + @ApiModelProperty("结算状态key") private String settlementStatus; + @ApiModelProperty("结算状态value") + private String settlementStatusValue; @ApiModelProperty(value = "厂家采购订单类型key") private String manPurOrderTypeKey; @ApiModelProperty(value = "厂家采购订单类型value") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 4169a2e855..eaae33771d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -70,8 +70,10 @@ public class BaseVehicleDto implements Dto { @ApiModelProperty(value = "买断日期") @NotBlank(message = "买断日期不能为空") private String solidDate; - @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）") + @ApiModelProperty("结算状态key") private String settlementStatus; + @ApiModelProperty("结算状态value") + private String settlementStatusValue; @ApiModelProperty("采购退库日期") @NotBlank(message = "采购退库日期不能为空") private String returnDate; 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 d929bbb59b..5eea07e624 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 @@ -176,7 +176,7 @@ public interface BaseVehicleFeign { */ @ApiOperation("车型详细配置接口（新）") @PostMapping("/selectExiCarConfig") - public ResultBean selectExiCarConfig(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid,@RequestParam("vehModelConfigSid") String vehModelConfigSid); + public ResultBean selectExiCarConfig(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid,@RequestParam("vehModelConfigSid") String vehModelConfigSid); /** * 现车分页列表（新） diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index ccffc3f4bd..38a48dc160 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -97,7 +97,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean selectExiCarConfig(String modelSid, String configSid, String userSid, String vehModelConfigSid) { + public ResultBean selectExiCarConfig(String modelSid, String configSid, String vehModelConfigSid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java index a28bcba7da..0244f1edd7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java @@ -24,15 +24,14 @@ import lombok.Data; public class BaseVehicleQuery implements Query { private static final long serialVersionUID = -2859517555985858222L; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; @ApiModelProperty(value = "车架号") private String vinNo; - @ApiModelProperty(value = "车型名称") private String modelName; - @ApiModelProperty(value = "存放地点") private String location; - @ApiModelProperty(value = "库存状态") private String vehicleState; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index 90eb6c8d31..b6c12466b1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -62,8 +62,10 @@ public class BaseVehicleSelectVo implements Vo { @ApiModelProperty(value = "买断日期") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date solidDate; - @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）") + @ApiModelProperty("结算状态key") private String settlementStatus; + @ApiModelProperty("结算状态value") + private String settlementStatusValue; @ApiModelProperty("采购退库日期") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date returnDate; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index edb044a529..f2937a36b2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -86,8 +86,10 @@ public class BaseVehicleVo implements Vo { private String lockedStateValue; @ApiModelProperty("返利3") private String rebate3; - @ApiModelProperty("结算状态 实销 1/买断 2") + @ApiModelProperty("结算状态key") private String settlementStatus; + @ApiModelProperty("结算状态value") + private String settlementStatusValue; @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty("特殊或差异说明") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 546b82b4ce..302dd128d9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -133,6 +133,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -403,7 +405,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService { * @param configSid 配置sid * @return */ - ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid); BusDepositVehListVo getBusDepositVehByVehSid(@Param("sid") String sid); @@ -417,5 +417,5 @@ public interface BaseVehicleMapper extends BaseMapper { IPage getPcVinByWarehouseSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("warehouseSid") String warehouseSid); - ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid,@Param("useOrg") String useOrg); + ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid); } \ 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 faa449f5ec..12d8acad93 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 @@ -412,8 +412,7 @@ LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.modelSid = #{modelSid} - AND bvc.configurationItemsSid = #{configSid} - AND bvc.useOrgSid = #{useOrg} + AND bvc.configurationItemsSid = #{configSid} LIMIT 1 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 ed73f19bd2..1e80be4e0d 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 @@ -290,13 +290,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { * @return */ @Override - public ResultBean selectExiCarConfig(String modelSid, String configSid, String userSid, String vehModelConfigSid) { + public ResultBean selectExiCarConfig(String modelSid, String configSid, String vehModelConfigSid) { ResultBean rb = ResultBean.fireFail(); if (StringUtils.isBlank(vehModelConfigSid)){ - ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid, userSid); + ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid); return rb.success().setData(exiCarConfigDetailVo); } - ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfigByVehModelConfigSid(vehModelConfigSid, userSid); + ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfigByVehModelConfigSid(vehModelConfigSid); return rb.success().setData(exiCarConfigDetailVo); } 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 2b58e73a05..1833e6a53d 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 @@ -100,6 +100,7 @@ public class BaseVehicleService extends MybatisBaseService @@ -58,7 +60,7 @@ public interface ScmApplyInboundFeign { @ApiOperation(value = "办理（同意）") @PostMapping("/complete") - public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody SubmitScmApplyInboundDto dto); + public ResultBean complete(@Valid @RequestBody ScmApplyInBoundCompleteDto dto); @ApiOperation(value = "撤回流程") @PostMapping(value = "/revokeProcess") @@ -78,12 +80,12 @@ public interface ScmApplyInboundFeign { @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId); @ApiOperation(value = "获取下一个环节") - @PostMapping(value = "/getNextNodesForSubmit") - ResultBean getNextNodesForSubmit(@ApiParam(value = "变量集合,json对象") @RequestBody @Valid SubmitScmApplyInboundDto dto); + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取上一个环节") - @PostMapping(value = "/getPreviousNodesForReject") - ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody @Valid SubmitScmApplyInboundDto dto); + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取入账申请流水号") @PostMapping(value = "/getLSH") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java index b88d958378..a96183df86 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java @@ -1,13 +1,14 @@ package com.yxt.anrui.scm.api.scmapplyinbound; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.ScmApplyInBoundCompleteDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * Project: anrui-scm(进销存)
@@ -55,7 +56,7 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign { } @Override - public ResultBean complete(SubmitScmApplyInboundDto variables) { + public ResultBean complete(@Valid ScmApplyInBoundCompleteDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmapplyinbound/complete无法访问"); } @@ -85,13 +86,13 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign { } @Override - public ResultBean getNextNodesForSubmit(SubmitScmApplyInboundDto dto) { + public ResultBean getNextNodesForSubmit(GetNodeQuery query) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmapplyinbound/getNextNodesForSubmit 无法访问"); } @Override - public ResultBean getPreviousNodesForReject(SubmitScmApplyInboundDto dto) { + public ResultBean getPreviousNodesForReject(GetNodeQuery query) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmapplyinbound/getPreviousNodesForReject 无法访问"); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java new file mode 100644 index 0000000000..1fafbf843e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmapplyinbound.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeVo.java new file mode 100644 index 0000000000..177e1d7706 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmapplyinbound.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundCompleteDto.java new file mode 100644 index 0000000000..1536284b40 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundCompleteDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.scm.api.scmapplyinbound.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class ScmApplyInBoundCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @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; + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables = new HashMap<>(); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundTaskQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundTaskQuery.java new file mode 100644 index 0000000000..867ff45184 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/ScmApplyInBoundTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.scm.api.scmapplyinbound.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class ScmApplyInBoundTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @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; + /*@ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/SubmitScmApplyInBoundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/SubmitScmApplyInBoundDto.java new file mode 100644 index 0000000000..84cb058c7e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/SubmitScmApplyInBoundDto.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmapplyinbound.flow; + +import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitScmApplyInBoundDto extends ScmApplyInboundDto { + private static final long serialVersionUID = 378585162071125756L; + /*@ApiModelProperty("意见") + private String comment;*/ + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; + /* @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("流程定义id") + private String modelId; + @ApiModelProperty("下一环节的代办人sid") + private String nextNodeUserSids;*/ + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java index dbf39ddfbc..8663f2128b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java @@ -1,8 +1,12 @@ package com.yxt.anrui.scm.biz.scmapplyinbound; -import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmapplyinbound.*; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.ScmApplyInBoundCompleteDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -10,6 +14,7 @@ import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -63,8 +68,11 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign { } @Override - public ResultBean complete(SubmitScmApplyInboundDto dto) { - return scmApplyInboundService.complete(dto); + public ResultBean complete(ScmApplyInBoundCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); + return scmApplyInboundService.complete(bv); } @Override @@ -88,13 +96,13 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign { } @Override - public ResultBean getNextNodesForSubmit(SubmitScmApplyInboundDto dto) { - return scmApplyInboundService.getNextNodesForSubmit(dto); + public ResultBean getNextNodesForSubmit(GetNodeQuery query) { + return scmApplyInboundService.getNextNodesForSubmit(query); } @Override - public ResultBean getPreviousNodesForReject(SubmitScmApplyInboundDto dto) { - return scmApplyInboundService.getPreviousNodesForReject(dto); + public ResultBean getPreviousNodesForReject(GetNodeQuery query) { + return scmApplyInboundService.getPreviousNodesForReject(query); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index dcef2cd314..d23970c790 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -25,6 +25,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmapplyinbound.*; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmapplyinbound.flow.ScmApplyInBoundCompleteDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo; @@ -193,7 +195,7 @@ public class ScmApplyInboundService extends MybatisBaseService 0){ + if (scmFiles.size() > 0) { for (ScmFileDto scmFile : scmFiles) { scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType()); scmFile.setLinkSid(inboundVehicle.getSid()); @@ -231,7 +233,7 @@ public class ScmApplyInboundService extends MybatisBaseService 0){ + if (scmFiles.size() > 0) { for (ScmFileDto scmFile : scmFiles) { scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType()); scmFile.setLinkSid(dto.getSid()); @@ -337,7 +339,7 @@ public class ScmApplyInboundService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert @@ -394,90 +396,76 @@ public class ScmApplyInboundService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); - BusinessVariables bv = new BusinessVariables(); - bv.setTaskId(booad.getTaskId()); - bv.setOrgSidPath(orgSidPath); - bv.setBusinessSid(dto.getSid()); - bv.setUserSid(dto.getUserSid()); - variables.put("businessSid", dto.getSid()); - bv.setTaskDefKey(booad.getTaskDefKey()); - bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(booad.getProcInsId()); - bv.setFormVariables(variables); - bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); - ResultBean rrb = flowableFeign.handleProsess(bv); - if (!rrb.getSuccess()) { - return rb.setMsg(rrb.getMsg()); - } - String taskDefKey = rrb.getData().getTaskDefKey(); - updateFlowFiled(rrb.getData()); - if ("Event_end".equals(taskDefKey)) { - List vehicleList = dto.getVehicleList(); - List baseVehicleDtos = new ArrayList<>(); - for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { - ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto(); - //配置的名称 - scmEntryVehicleExamineDto.setConfigName(dto.getConfigName()); - scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid()); - scmEntryVehicleExamineDto.setModelName(dto.getModelName()); - scmEntryVehicleExamineDto.setModelSid(dto.getModelSid()); - //订单类型 - scmEntryVehicleExamineDto.setPurchaseTypeKey("03"); - scmEntryVehicleExamineDto.setPurchaseType("排产"); - scmEntryVehicleExamineDto.setUserSid(dto.getUserSid()); - scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); - scmEntryVehicleExamineDto.setInspectionResult("1"); - scmEntryVehicleExamineDto.setDepartureDate(dto.getDepartureDate()); - ResultBean resultBean = scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); - if (!resultBean.getSuccess()) { - return rb.setMsg("验车业务模块的数据推送失败!"); + String businessSid = bv.getBusinessSid(); + ScmApplyInbound booad = this.fetchBySid(businessSid); + if (bv.getTaskId().equals(booad.getTaskId())) { + ResultBean resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + List scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid); + List baseVehicleDtos = new ArrayList<>(); + for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) { + ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto(); + //配置的名称 + scmEntryVehicleExamineDto.setConfigName(booad.getConfigName()); + scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid()); + scmEntryVehicleExamineDto.setModelName(booad.getModelName()); + scmEntryVehicleExamineDto.setModelSid(booad.getModelSid()); + //订单类型 + scmEntryVehicleExamineDto.setPurchaseTypeKey("03"); + scmEntryVehicleExamineDto.setPurchaseType("排产"); + scmEntryVehicleExamineDto.setUserSid(bv.getUserSid()); + scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); + scmEntryVehicleExamineDto.setInspectionResult("1"); + scmEntryVehicleExamineDto.setDepartureDate(booad.getDepartureDate()); + ResultBean resultBean1 = scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); + if (!resultBean1.getSuccess()) { + return rb.setMsg("验车业务模块的数据推送失败!"); + } + ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto(); + scmVehinspectItemDto.setVehInspectSid(resultBean1.getData()); + scmVehinspectItemService.saveItem(scmVehinspectItemDto); + //车辆台账推送数据 + BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); + baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); + baseVehicleDto.setModelSid(booad.getModelSid()); + baseVehicleDto.setModelName(booad.getModelName()); + String userSid = bv.getUserSid(); + ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); + String data = pathSidByUserSid.getData(); + baseVehicleDto.setCreateOrgSid(data); + baseVehicleDto.setUseOrgSid(data); + baseVehicleDto.setModelConfigSid(booad.getConfigSid()); + baseVehicleDto.setConfigName(booad.getConfigName()); + baseVehicleDto.setInsideCode(booad.getInsideCode()); + baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo()); + baseVehicleDto.setSettlementStatus("0"); + baseVehicleDto.setLockedState("0"); + baseVehicleDto.setLockedStateValue("未锁定"); + baseVehicleDto.setVehicleState("0003"); + baseVehicleDto.setVehicleStateValue("在途"); + baseVehicleDto.setManPurOrderTypeKey("001"); + baseVehicleDto.setManPurOrderTypeValue("排产订单"); + baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString()) + baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()) + baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString()) + baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate() + baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate() + baseVehicleDtos.add(baseVehicleDto); } - ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto(); - scmVehinspectItemDto.setVehInspectSid(resultBean.getData()); - scmVehinspectItemService.saveItem(scmVehinspectItemDto); - //车辆台账推送数据 - BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); - baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); - baseVehicleDto.setModelSid(dto.getModelSid()); - baseVehicleDto.setModelName(dto.getModelName()); - String userSid = dto.getUserSid(); - ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); - String data = pathSidByUserSid.getData(); - baseVehicleDto.setCreateOrgSid(data); - baseVehicleDto.setModelConfigSid(dto.getConfigSid()); - baseVehicleDto.setConfigName(dto.getConfigName()); - baseVehicleDto.setInsideCode(dto.getInsideCode()); - baseVehicleDto.setOrderingNo(dto.getPurchaseOrderNo()); - baseVehicleDto.setSettlementStatus("0"); - baseVehicleDto.setLockedState("0"); - baseVehicleDto.setLockedStateValue("未锁定"); - baseVehicleDto.setVehicleState("0003"); - baseVehicleDto.setVehicleStateValue("在途"); - baseVehicleDto.setManPurOrderTypeKey("001"); - baseVehicleDto.setManPurOrderTypeValue("排产订单"); - baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString()) - baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()) - baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString()) - baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate() - baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate() - baseVehicleDtos.add(baseVehicleDto); + baseVehicleFeign.saveAll(baseVehicleDtos); } - baseVehicleFeign.saveAll(baseVehicleDtos); + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); } - return rrb; } /** @@ -570,22 +558,20 @@ public class ScmApplyInboundService extends MybatisBaseService selectListByAppSid(@Param("applySid") String applySid); + + @Select("select * from scm_apply_inbound_vehicle where applySid = #{businessSid}") + List fetchByMainSid(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java index 695f321584..95fedcca15 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java @@ -115,4 +115,8 @@ public class ScmApplyInboundVehicleService extends MybatisBaseService selectListByAppSid(String applySid) { return baseMapper.selectListByAppSid(applySid); } + + public List fetchByMainSid(String businessSid) { + return baseMapper.fetchByMainSid(businessSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 8583c4282c..3a12ccea92 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -897,7 +897,7 @@ public class ScmVehicleGressionService extends MybatisBaseService