diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java index a5da8a4b10..08b2cc3129 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java @@ -90,4 +90,10 @@ public class BusDeposit extends BaseEntity { @ApiModelProperty("付款凭证") private String paymentProof; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java index c6eea0d86a..71b4c27005 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java @@ -104,4 +104,11 @@ public class BusDepositDto implements Dto { @ApiModelProperty("订车车辆信息List") private List busDepositVehicleDto; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java index 661b5837c6..d61e406b1e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java @@ -38,4 +38,5 @@ public interface BusDepositFeign { @GetMapping("/getDepositInfoDetails/{virtualOrderSid}") public ResultBean getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java index 5ab52175d5..9c68500f3c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java @@ -53,4 +53,10 @@ public class BusDepositVo extends BusMainDepositVo{ @ApiModelProperty("客户列表") private List customerList = new ArrayList<>(); + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java index c9a9a6a43b..f6369613bf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java @@ -53,28 +53,38 @@ import java.util.Date; public class BusMainDeposit extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("单据编号（制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000）") + + @ApiModelProperty("单据编号（制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000）") private String billNo; - - @ApiModelProperty("业务员Sid（是不是应该是二级？）") + + @ApiModelProperty("业务员Sid（是不是应该是二级？）") private String staffSid; - - @ApiModelProperty("业务员姓名") + + @ApiModelProperty("业务员姓名") private String staffName; - - @ApiModelProperty("组织机构sid") + + @ApiModelProperty("组织机构sid") private String orgSid; - - @ApiModelProperty("部门名称") + + @ApiModelProperty("部门名称") private String orgName; - - @ApiModelProperty("制单日期") + + @ApiModelProperty("制单日期") private String createDate; @ApiModelProperty("单据类型key") private String depositBillTypeKey; - - @ApiModelProperty("单据类型") + + @ApiModelProperty("单据类型") private String depositBillType; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; + + @ApiModelProperty(value = "节点状态") + private String nodeState; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java index 0b5b74a77c..de6f5ffed4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java @@ -69,15 +69,15 @@ public interface BusMainDepositFeign { @ApiOperation("保存虚拟订单（订金）") @PostMapping("/saveDeposit") - public ResultBean saveDeposit(@Valid @RequestBody BusDepositDto dto); + public ResultBean saveOrUpdateDeposit(@Valid @RequestBody BusDepositDto dto); @ApiOperation("保存虚拟订单（预定车辆）") @PostMapping("/saveDepositVehicle") public ResultBean saveDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto); - @ApiOperation("修改虚拟订单（订金）信息") + /* @ApiOperation("修改虚拟订单（订金）信息") @PostMapping("/updateDeposit/{sid}") - public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid); + public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid);*/ @ApiOperation("修改虚拟订单（预定车辆）信息") @PostMapping("/updateDepositVehicle/{sid}") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java index c135b05917..5b711363ac 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java @@ -62,7 +62,7 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign { } @Override - public ResultBean saveDeposit(BusDepositDto dto){ + public ResultBean saveOrUpdateDeposit(BusDepositDto dto){ return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问"); } @@ -71,10 +71,10 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign { return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问"); } - @Override + /*@Override public ResultBean updateDeposit(BusDepositDto dto, String sid){ return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问"); - } + }*/ @Override public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java index 40d234c554..a8ecdca27c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java @@ -41,4 +41,5 @@ public interface BusDepositMapper extends BaseMapper { @Delete("delete from bus_deposit where billSid=#{billSid}") int delByBillSid(String billSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index 6c99d68996..7192b927ce 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml @@ -43,4 +43,5 @@ AND staffSid = #{staffSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 8fb1a61969..2316390f82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -5,6 +5,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.*; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; +import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; @@ -153,4 +154,6 @@ public class BusDepositService extends MybatisBaseService { int deleteVirtualOrder(@Param("staffSid") String staffSid, @Param("virtualOrderSid") String virtualOrderSid); BusMainDeposit selectBySid(@Param("virtualOrderSid") String virtualOrderSid); - + /** + * 更新虚拟订单审批（订金）业务表中的流程状态 + * @param businessSid 业务sid + * @param proDefId 流程定义sid + * @param nodeState 环节状态 + * @param procInsId 流程实例sid + * @param taskDefKey 环节sid + */ + void modifiBusDepositFlowState(@Param("businessSid") String businessSid,@Param("procDefId") String procDefId,@Param("nodeState") String nodeState, + @Param("procInstSid") String procInstSid,@Param("nodeSid") String nodeSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 129888b67a..900364665f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -113,4 +113,10 @@ FROM bus_main_deposit bmd WHERE bmd.sid = #{virtualOrderSid} + + + + update bus_main_deposit set procDefId=#{procDefId},nodeState=#{nodeState},procInstSid=#{procInstSid},nodeSid=#{nodeSid} + where sid=#{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java index 7c9b074794..2965c88a2f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java @@ -79,11 +79,11 @@ public class BusMainDepositRest implements BusMainDepositFeign { } @Override - public ResultBean saveDeposit(BusDepositDto dto) { + public ResultBean saveOrUpdateDeposit(BusDepositDto dto) { if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) { return new ResultBean().fail().setMsg("只可上传一张付款凭证"); } - return busMainDepositService.saveDeposit(dto); + return busMainDepositService.saveOrUpdateDeposit(dto); } @Override @@ -91,13 +91,13 @@ public class BusMainDepositRest implements BusMainDepositFeign { return busMainDepositService.saveDepositVehicle(dto); } - @Override + /*@Override public ResultBean updateDeposit(BusDepositDto dto, String sid) { if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) { return new ResultBean().fail().setMsg("只可上传一张付款凭证"); } - return busMainDepositService.updateDeposit(dto, sid); - } + return saveDeposit(dto);// busMainDepositService.updateDeposit(dto, sid); + }*/ @Override public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index fc1c21278f..c91e79f3ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -195,7 +195,20 @@ public class BusMainDepositService extends MybatisBaseService map = generateBillNo(dto.getUserSid()); BusMainDeposit busMainDeposit = new BusMainDeposit(); @@ -305,7 +318,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); + variables.put("businessSid", businessSid); + variables.put("isLoan", true); + variables.put("orgSid", orgSid);//部门sid + ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); + if (resultBean.getSuccess() && resultBean.getData() != null) { + Map map = (Map) resultBean.getData(); + /*saveSysFormLink(map);*/ + //更新虚拟订单审批（订金）业务表中的流程状态 + modifiBusMainDepositFlowState(businessSid, + procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId + map.get("nodeState"),//state + map.get("procInsId"),//procInstSid + map.get("taskDefKey")//nodeSid + ); + } + return resultBean; + } + private void modifiBusMainDepositFlowState(String businessSid, + String proDefId,//procDefId + String nodeState,//state + String procInsId,//procInstSid + String taskDefKey//nodeSid + ){ + baseMapper.modifiBusDepositFlowState(businessSid, + proDefId,//procDefId + nodeState,//state + procInsId,//procInstSid + taskDefKey); + } + /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) { + String orgSid = checkUserOrg(dto.getUserSid()); String businessSid = ""; if (StringUtils.isBlank(orgSid)) { return new ResultBean().fail().setMsg("用户组织机构不能为空"); @@ -724,7 +772,7 @@ public class BusMainDepositService extends MybatisBaseService> listPage(@RequestBody PagerQuery pagerQuery); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java new file mode 100644 index 0000000000..8f2befc9cf --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:40 + * @Description + */ +@Component +public class ScmVehicleReturnFeignFallback { +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java new file mode 100644 index 0000000000..44ec1a1e7d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:55 + * @Description + */ +@Data +public class ScmVehicleReturnQuery implements Query { + private static final long serialVersionUID = 3301749651674469965L; + @ApiModelProperty(value = "开始日期") + private String applyDateStart; + + @ApiModelProperty(value = "结束日期") + private String applyDateEnd; + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java new file mode 100644 index 0000000000..feed0ad8c8 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:48 + * @Description + */ +@Data +public class ScmVehicleReturnVo implements Vo { + private static final long serialVersionUID = 115347131385810982L; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "状态") + private String state; + @ApiModelProperty(value = "申请编号") + private String applicationCode; + @ApiModelProperty(value = "申请人") + private String applicationName; + @ApiModelProperty(value = "申请日期") + private String createTime; + @ApiModelProperty(value = "退库原因") + private String reason; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java new file mode 100644 index 0000000000..56fcd8ed33 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:24 + * @Description + */ +@Data +public class ScmVehicleReturnDetails extends BaseEntity { + private static final long serialVersionUID = 67935382962875224L; + @ApiModelProperty(value = "采购退库申请sid") + private String vehicleOutSid; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "常用配置") + private String configName; + @ApiModelProperty(value = "入库日期") + private Date inboundDate; +} 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 new file mode 100644 index 0000000000..25d146b2b1 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.scm.biz.scmvehiclereturn; + +import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnFeign; +import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnQuery; +import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +/** + * @Author dimengzhe + * @Date 2022/4/6 17:45 + * @Description + */ +public class ScmVehicleReturnRest implements ScmVehicleReturnFeign { + @Override + public ResultBean> listPage(PagerQuery pagerQuery) { + return null; + } +} diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index 9fa90b9980..3a613358d6 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -646,4 +646,53 @@ CREATE TABLE `scm_vehicle_inbound` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='车辆入库管理表'; +-- 车辆采购退库 +DROP TABLE IF EXISTS `scm_vehicle_return`; +CREATE TABLE `scm_vehicle_return` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(申请日期)', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid(申请人sid)', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applicationCode` varchar(64) DEFAULT NULL COMMENT '申请编号', + `applicationName` varchar(64) DEFAULT NULL COMMENT '申请人', + `reason` varchar(500) DEFAULT NULL COMMENT '退库原因', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库'; + + +-- 车辆采购退库详细 +DROP TABLE IF EXISTS `scm_vehicle_return_details`; +CREATE TABLE `scm_vehicle_return_details` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `vehicleOutSid` varchar(64) DEFAULT NULL COMMENT '采购退库申请sid', + `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', + `modelName` varchar(500) DEFAULT NULL COMMENT '车型名称', + `configName` varchar(500) DEFAULT NULL COMMENT '常用配置', + `inboundDate` timestamp null DEFAULT NULL COMMENT '入库日期', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库详细'; +