From a8f6b8fc86e07a969e3fd3d905f1dd309cf51a21 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 26 Jul 2022 14:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseaccadjapply/BaseAccadjApplyQuery.java | 2 ++ .../BaseShuntingInvoicingApplyQuery.java | 2 ++ .../base/api/basevehicle/BaseVehicleVo.java | 4 +++ .../commonappendix/CommonAttachTypeEnum.java | 3 +- .../BaseAccadjApplyService.java | 2 ++ .../BaseShuntingInvoicingApplyService.java | 2 ++ .../biz/basevehicle/BaseVehicleService.java | 1 + .../anrui/flowable/api/utils/ProcDefEnum.java | 6 ++-- .../ScmApplyInboundService.java | 33 +++++++++++++++++++ .../anrui/scm/biz/scmfile/ScmFileMapper.java | 9 ++++- .../anrui/scm/biz/scmfile/ScmFileService.java | 8 +++++ 11 files changed, 67 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java index cf223667e5..5b8f4f7f24 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java @@ -49,6 +49,8 @@ import lombok.Data; @ApiModel(value = "调账申请表 查询条件", description = "调账申请表 查询条件") public class BaseAccadjApplyQuery implements Query { + @ApiModelProperty("当前登录人sid") + private String userSid; // 当前登录人sid @ApiModelProperty("申请开始日期") private String applyStartDate; // 申请开始日期 @ApiModelProperty("申请结束日期") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java index a5b9fd47ce..37bfb5e764 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java @@ -49,6 +49,8 @@ import lombok.Data; @ApiModel(value = "调车开票申请表 查询条件", description = "调车开票申请表 查询条件") public class BaseShuntingInvoicingApplyQuery implements Query { + @ApiModelProperty("当前登录人sid") + private String userSid; // 当前登录人sid @ApiModelProperty("申请开始日期") private String applyStartDate; // 申请开始日期 @ApiModelProperty("申请结束日期") 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 a70f71e973..30e32d39a4 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 @@ -28,6 +28,10 @@ public class BaseVehicleVo implements Vo { @ApiModelProperty(value = "车辆sid") private String sid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("常用配置sid") + private String modelConfigSid; @ApiModelProperty("常用配置名称") private String configName; @ApiModelProperty("车架号(VIN)（陕汽必须的字段）") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index 607ac1a870..b2cb4fc18b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -50,7 +50,8 @@ public enum CommonAttachTypeEnum { MANUFACTOR_SUB("0013", "厂商认款附件"), MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"), SHUNTINGINVOICINAPPLY("0015", "调车开票附件"), - OUTSOURCINGAPPLY("0016", "外采申请附件"); + OUTSOURCINGAPPLY("0016", "外采申请附件"), + INBOUNDAPPLY("0017", "入账申请附件"); /** * 附件类型 */ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index d1eecfa367..7751b39728 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -127,6 +127,8 @@ public class BaseAccadjApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java index e85b5d4f3b..9851d4eb58 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java @@ -117,6 +117,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); 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 ca45c7496e..b4bc6e2fc9 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 qw = new QueryWrapper<>(); if (pagerQuery != null) { qw.eq("bv.isDelete", "0"); + qw.orderByDesc("bv.priceDate"); if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号 qw.like("bv.vinNo", pagerQuery.getVinNo()); } 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 368b83a557..ae003ba41d 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 @@ -22,13 +22,13 @@ public enum ProcDefEnum { SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"), - BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:315150"), + BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:400004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:5:382504"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:4:320016"), FINPAYAPPLY("付款申请","process_gin2tntb:2:320012"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), - BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:352504"), - BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:352508") + BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:400012"), + BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008") ; ProcDefEnum(String proDefName, String proDefId) { 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 03709aaa87..b209c60cfa 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 @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat import com.yxt.anrui.base.api.baseoutsourcingapplication.SubmitBaseOutSourcingApplicationDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -25,14 +26,18 @@ import com.yxt.anrui.scm.api.scmapplyinbound.*; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo; +import com.yxt.anrui.scm.api.scmfile.ScmFileDto; +import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.biz.flow.FlowableService; import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService; +import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService; import com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService; +import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -79,6 +84,10 @@ public class ScmApplyInboundService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -134,6 +143,7 @@ public class ScmApplyInboundService extends MybatisBaseService saveOrUpdateApplyInBound(ScmApplyInboundDto dto) { + List scmFiles = dto.getScmFiles(); // 验证车架号：不能为空、不能重复 /* List vehicleList = dto.getVehicleList(); List vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); @@ -176,6 +186,13 @@ public class ScmApplyInboundService extends MybatisBaseService 0){ + for (ScmFileDto scmFile : scmFiles) { + scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType()); + scmFile.setLinkSid(inboundVehicle.getSid()); + scmFileService.saveOrUpdateDto(scmFile); + } + } return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid()); } else { // 修改 List vehicleList = dto.getVehicleList(); @@ -206,6 +223,14 @@ public class ScmApplyInboundService extends MybatisBaseService 0){ + for (ScmFileDto scmFile : scmFiles) { + scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType()); + scmFile.setLinkSid(dto.getSid()); + scmFileService.saveOrUpdateDto(scmFile); + } + } // 更新车辆列表信息 scmApplyInboundVehicleService.updateApplyInboundVehicleList(vehicleList); return new ResultBean().success().setMsg("修改成功").setData(dto.getSid()); @@ -223,7 +248,15 @@ public class ScmApplyInboundService extends MybatisBaseService list = scmApplyInboundVehicleService.selectListByAppSid(sid); + List scmFileVos = scmFileService.fetchByMainSid(sid); + for (ScmFileVo scmFileVo : scmFileVos) { + String filePath = scmFileVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + scmFileVo.setFilePath(filePath); + } vo.setVehicleList(list); + vo.setScmFiles(scmFileVos); return vo; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java index 8c0035fe9e..a314a17f1e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -67,6 +68,12 @@ public interface ScmFileMapper extends BaseMapper { @Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}") List selectByLinkSid(@Param("sid") String sid, @Param("type") String type); - @Select("delete from scm_file where linkSid = #{sid} and attachType = #{type}") + @Delete("delete from scm_file where linkSid = #{sid} and attachType = #{type}") void deleteByLinkSidAndType(@Param("sid") String sid, @Param("type") String type); + + @Select("select * from scm_file where linkSid = #{sid}") + List fetchByMainSid(String sid); + + @Delete("delete from scm_file where linkSid = #{sid}") + void delByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java index 355bfe617e..cad2e1c2f5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java @@ -148,4 +148,12 @@ public class ScmFileService extends MybatisBaseService { public void deleteByLinkSidAndType(String sid, String type) { baseMapper.deleteByLinkSidAndType(sid, type); } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } } \ No newline at end of file