From 7c7db0dd81bfaa386b0cb622fc36280dd26ca5e4 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 3 Sep 2022 11:43:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 2 +- .../paichanguanli/cheliangpaichanEdit.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index 6a9edc3e02..7bd2d9575c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -52,7 +52,7 @@
订金付款备注:
- + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index d5463716fb..a0ce760a92 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -51,7 +51,7 @@
订金付款备注:
- + @@ -267,15 +267,15 @@ export default { this.formobj.busVehicleApplyDetailList.push({ quantity: '', applySid: '', - configSid: e.configurationItemsSid, + configSid: e.configSid, configName: e.configName, // useDeposit: '', - contractPrice: '', applyForDeposit: '', + contractPrice: '', remarks: '', - saleGuPrice: '', + saleGuPrice: e.guidedPrice, insideCode: e.insideCode, // 内部编码 - vehicleName: e.modelName, + vehicleName: e.vehicleAlias, vehicleSid: e.modelSid, guidePrice: '' }) From 3129a609e88dba43d59dab51dcd5b309a7763893 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Sat, 3 Sep 2022 14:46:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E3=80=81=E9=A9=B3=E5=9B=9E=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskService.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 4a1331c39d..9a5b4ca810 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -1353,12 +1353,20 @@ public class FlowTaskService extends MybatisBaseService list1=new ArrayList<>(); + for( SequenceFlow sequenceFlow:list){ + String sourceRef = sequenceFlow.getSourceRef(); + list1= historyService.createHistoricActivityInstanceQuery().activityId(sourceRef) + .processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().desc().list(); + if(list1.size()>0){ + break; + } + } + // 获取上一个节点的activityId + + + HistoricActivityInstance historicActivityInstance = list1.get(0);//singleResult() String activityType = historicActivityInstance.getActivityType(); String historicActivityInstanceActivityId = historicActivityInstance.getActivityId(); if (!"userTask".equals(activityType)) { @@ -1593,11 +1601,15 @@ public class FlowTaskService extends MybatisBaseService Date: Sat, 3 Sep 2022 15:34:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/VehicleGression.java | 4 +- .../biz/basevehicle/BaseVehicleService.java | 9 +- .../AppScmVehicleCarTransferSiteImageDto.java | 6 ++ .../AppScmVehicleGressionDetailsVo.java | 6 ++ .../AppScmVehicleGressionPageVo.java | 2 + .../ScmVehicleGressionRest.java | 2 +- .../ScmVehicleGressionService.java | 89 +++++++++++++------ .../ScmVehicleGressionVehMapper.java | 4 + .../ScmVehicleGressionVehService.java | 4 + .../AppCarTransferSiteImageDto.java | 6 ++ .../AppGressionDetailsVo.java | 12 +++ .../scmvehiclegression/AppGressionInfoVo.java | 6 ++ .../scmvehiclegression/AppGressionPageVo.java | 2 + .../AppScmVehicleGressionService.java | 10 +-- 14 files changed, 126 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java index 0fcb72e1d7..a4da9d90df 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java @@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class VehicleGression implements Dto { @@ -11,7 +13,7 @@ public class VehicleGression implements Dto { private static final long serialVersionUID = -8486627972024814008L; @ApiModelProperty("车架号") - private String vin; + private List vin; @ApiModelProperty("存放地点sid") private String location; 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 9ce0eb7376..ee8e1b4cef 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 @@ -1428,8 +1428,8 @@ public class BaseVehicleService extends MybatisBaseService vin = vehicleGression.getVin(); + for (String s : vin) { + baseMapper.updateVehicleGressionByVin(s, vehicleGression.getLocation(), vehicleGression.getLocationName()); + } return rb.success(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java index 3fca37aa9f..7813300e80 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java @@ -18,6 +18,12 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto { @ApiModelProperty("保存车辆移库现场照片") private List images; + @ApiModelProperty("保单照片") + private String policyImages; + + @ApiModelProperty("临牌") + private String proCard; + @ApiModelProperty("地址") private String address; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java index d53d721137..97b9927b07 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java @@ -106,6 +106,12 @@ public class AppScmVehicleGressionDetailsVo implements Vo { @ApiModelProperty("经纬度") private String locationCode; + @ApiModelProperty("显示保单照片") + private boolean insuranceShow; + + @ApiModelProperty("显示临牌文本框") + private boolean proCardShow; + @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java index a4df1add39..8d1ff90541 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java @@ -52,6 +52,8 @@ public class AppScmVehicleGressionPageVo implements Vo { private String sid; @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车数量") + private String vinNum; @ApiModelProperty("申请编号") private String applyId; @ApiModelProperty("审核状态") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java index f9b6fa0ce9..98b625c3d7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -212,7 +212,7 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { @Override public ResultBean getErtraState(String sid, String userSid) { - return scmVehicleGressionService.getErtraState(sid,userSid); + return scmVehicleGressionService.getErtraState(sid, userSid); } @Override 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 a1546cb1f5..a3bd631325 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 @@ -264,6 +264,8 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = scmVehicleGressionVehService.fetchVoByMainSid(record.getSid()); + int size = vins.size(); + record.setVinNum(String.valueOf(size)); String vin = StringUtils.join(vins, ","); record.setVin(vin); @@ -395,28 +397,42 @@ public class ScmVehicleGressionService extends MybatisBaseService factoryImage = dto.getPolicyImage(); - if (factoryImage.size() <= 0) { - return rb.setMsg("保单照片不能为空"); - } - scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); - for (String s : factoryImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile = new ScmFile(); - scmFile.setAttachType(type); - scmFile.setFileName("保单照片"); - scmFile.setFilePath(s1); - scmFile.setLinkSid(scmVehicleGression.getSid()); - scmFileService.save(scmFile); +// if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 +// List factoryImage = dto.getPolicyImage(); +// if (factoryImage.size() <= 0) { +// return rb.setMsg("保单照片不能为空"); +// } +// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); +// for (String s : factoryImage) { +// if (s.contains(fileUploadComponent.getUrlPrefix())) { +// s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); +// } +// ScmFile scmFile = new ScmFile(); +// scmFile.setAttachType(type); +// scmFile.setFileName("保单照片"); +// scmFile.setFilePath(s1); +// scmFile.setLinkSid(scmVehicleGression.getSid()); +// scmFileService.save(scmFile); +// } +// } else if ("0".equals(dto.getInsuranceStateKey())) { +// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); +// } + updateById(scmVehicleGression); + scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid()); + List vins = dto.getVins(); + if (vins != null) { + for (String vin : vins) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVeh.setVehVin(vin); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); + scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); + scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } - } else if ("0".equals(dto.getInsuranceStateKey())) { - scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); } - updateById(scmVehicleGression); - } return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功"); } @@ -468,6 +484,12 @@ public class ScmVehicleGressionService extends MybatisBaseService policyImage = new ArrayList<>(); List image = new ArrayList<>(); AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid); + if ("1".equals(vo.getInsuranceStateKey())) { + vo.setInsuranceShow(true); + } + if ("1".equals(vo.getProCardStateKey())) { + vo.setProCardShow(true); + } List vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); String vin = StringUtils.join(vins, StringUtils.LF); vo.setVinNo(vin); @@ -525,19 +547,32 @@ public class ScmVehicleGressionService extends MybatisBaseService images = dto.getImages(); if (images.size() > 0) { for (String s : images) { if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); } ScmFile scmFile = new ScmFile(); - scmFile.setAttachType(type); + scmFile.setAttachType(type2); scmFile.setFileName("车辆移库现场照片"); - scmFile.setFilePath(s1); + scmFile.setFilePath(s2); scmFile.setLinkSid(dto.getSid()); scmFileService.save(scmFile); } @@ -545,6 +580,7 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); + vehicleGression.setVin(list); vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid()); vehicleGression.setLocationName(scmVehicleGression.getTargetLocation()); baseVehicleFeign.updateVehicleGressionByVin(vehicleGression); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java index 76b5d9a0fa..a98f555755 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDetailsVo; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -68,4 +69,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper fetchVoByMainSid(@Param("mainSid") String mainSid); + + @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}") + void deleteByMainSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java index 69adb6a5f2..bc84d11204 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java @@ -113,4 +113,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService images; + @ApiModelProperty("保单照片") + private String policyImages; + + @ApiModelProperty("临牌") + private String proCard; + @ApiModelProperty("地址") private String address; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index a16ebccb45..49146cafdc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -84,9 +84,21 @@ public class AppGressionDetailsVo implements Vo { @ApiModelProperty("保险状态") private String InsuranceStateKey; + @ApiModelProperty("临牌状态") + private String proCardState; + + @ApiModelProperty("临牌状态") + private String proCardStateKey; + @ApiModelProperty("保单照片") private List policyImage; + @ApiModelProperty("显示保单照片") + private boolean insuranceShow; + + @ApiModelProperty("显示临牌文本框") + private boolean proCardShow; + @ApiModelProperty("地址") private String address; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index 87dc8f2cf5..e9749fb8f5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -85,6 +85,12 @@ public class AppGressionInfoVo implements Vo { @JsonProperty("insuranceStateKey") private String InsuranceStateKey; + @ApiModelProperty("临牌状态") + private String proCardState; + + @ApiModelProperty("临牌状态") + private String proCardStateKey; + @ApiModelProperty("保单照片") private List policyImage; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java index 176d03bbc3..a610fc64c9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java @@ -12,6 +12,8 @@ public class AppGressionPageVo implements Vo { private String sid; @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车数量") + private String vinNum; @ApiModelProperty("申请编号") private String applyId; @ApiModelProperty("状态") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java index 230292fa4c..10d4329d17 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java @@ -140,11 +140,11 @@ public class AppScmVehicleGressionService { ResultBean rb = ResultBean.fireFail(); SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto(); BeanUtil.copyProperties(dto, submitCarTransferDto); - //根据车架号查询车辆sid - ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()); - if (stringResultBean.getSuccess()) { - submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid()); - } +// //根据车架号查询车辆sid +// ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()); +// if (stringResultBean.getSuccess()) { +// submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid()); +// } ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); From bcc551959c2c82f9293bca8fae683b4084d03935 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 3 Sep 2022 16:16:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleactualsales/BaseVehicleActualSalesService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index b35fd5b1fe..0794b26ebd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -263,6 +263,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -316,7 +318,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService detailsList = dto.getDetailsList(); for (BaseVehicleActualDetailsDto f : detailsList) { - BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(f.getVinNo()); + BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(),useOrgSid); baseVehicle.setVinNo(f.getVinNo()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode()); baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks()); From f155267650e61335857cb8073d24e4d23c7b71bc Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 3 Sep 2022 17:09:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/bikerebate/bicyclerebatecheck.js | 56 ++ .../bicyclerebatecheck/bicyclerebatecheck.vue | 54 +- .../bicyclerebatecheckAdd.vue | 29 +- .../bicyclerebatecheckInfo.vue | 41 +- .../bicyclerebatetobechecked.vue | 2 +- .../relation/bicyclerebatetobecheckedInfo.vue | 109 +--- .../relation/yiheduidanchefanli.vue | 205 +++++-- .../danchefanliheduiDaiBanInfo.vue | 400 +++++++++++++ .../danchefanliheduiEdit.vue | 558 ++++++++++++++++++ .../danchefanliheduiYiBanInfo.vue | 276 +++++++++ .../relation/bicyclerebatetobecheckedAdd.vue | 198 +++++++ .../relation/bicyclerebatetobecheckedInfo.vue | 155 +++++ .../relation/yiheduidanchefanli.vue | 356 +++++++++++ 13 files changed, 2279 insertions(+), 160 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js index de8c1a49cd..866236389b 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js @@ -78,4 +78,60 @@ export default { method: 'get' }) }, + // 提交流程 + submitVehicleApply: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/submitVehRebateCheckApply', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 代办任务同意办理 + complete: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/complete', + method: 'post', + data: params + }) + }, + // 代办任务驳回任务 + reject: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/reject', + method: 'post', + data: params + }) + }, + // 代办任务终止任务 + breakProcess: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/breakProcess', + method: 'post', + data: params + }) + }, + // 代办任务撤回任务 + revokeProcess: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/revokeProcess', + method: 'post', + data: params + }) + }, + + getNextNodesForSubmit: function(data) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + getPreviousNodesForReject(data) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue index e1902aa119..135962bb67 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue @@ -42,13 +42,14 @@ - + @@ -110,6 +111,10 @@ + + + + @@ -120,6 +125,8 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons' import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' +import bicyclerebatecheckInfo from './bicyclerebatecheckInfo' +import {getStorage} from "@/utils/auth"; export default { name: 'bicyclerebatecheck', @@ -127,10 +134,14 @@ export default { Pagination, pageye, ButtonBar, - bicyclerebatecheckAdd + bicyclerebatecheckAdd, + bicyclerebatecheckInfo }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, btnList: [ { @@ -178,9 +189,40 @@ export default { this.init() }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.init() + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, init() { getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { if (resp.success) { @@ -263,7 +305,7 @@ export default { size: 5, total: 0 } - this.getList() + this.init() }, handleClick() { this.$parent.resetState() @@ -273,7 +315,7 @@ export default { this.$refs['divAdd'].showEdit(row) }, toInfo(row) { - this.viewState = 4 + this.viewState = 3 this.$refs['divInfo'].showInfo(row) }, doDel() { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index c2b5166932..f8bf8fc3f7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -9,6 +9,8 @@
保存 + 提交 + 关闭
@@ -220,6 +222,7 @@ export default { formobj: { sid: '', createByName: '', + createBySid: '', brandName: '', brandSid: '', checkApply: '', @@ -238,7 +241,6 @@ export default { } }, methods: { - // 获取制单日期 newDate() { let date = new Date() @@ -269,6 +271,7 @@ export default { this.formobj.createOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid this.formobj.createByName = window.sessionStorage.getItem('name') + this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.viewTitle = '【新增】单车返利核对审核申请' }, showEdit(row) { @@ -280,6 +283,7 @@ export default { console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { this.formobj = resp.data + this.formobj.createBySid = window.sessionStorage.getItem('userSid') }).catch((e) => { this.formobj = row }) @@ -491,6 +495,28 @@ export default { } }) }, + submit() { + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.submitdisabled = true + req.submitVehicleApply(this.formobj).then((resp) => { + this.submitdisabled = false + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } + }).catch(() => { + this.submitdisabled = false + }) + } else { + return false + } + }) + }, // 返回（===既判断） handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -498,6 +524,7 @@ export default { this.formobj = { sid: '', createByName: '', + createBySid: '', brandName: '', brandSid: '', checkApply: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index e0704b25f5..b218ad9d85 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -15,10 +15,18 @@
单车返利核对审核申请
+ + + 品牌: + + + {{ formobj.brandName }} + +
本月各项返利核对情况
- +