yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

移库问题

master
hp 3 years ago
parent
3129a609e8
commit
d3622daf4b
14 changed files with 126 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java
  2. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java
  4. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
  5. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java
  6. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
  7. 89
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  8. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java
  9. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java
  10. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java
  11. 12
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java
  12. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
  13. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java
  14. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java
View File

@ -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<String> vin;
@ApiModelProperty("存放地点sid")
private String location;

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -1428,8 +1428,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
//非删除
qw.eq("bv.isDelete", 0);
if(StringUtils.isNotBlank(params.getOrderingNo())){
qw.like("bv.orderingNo",params.getOrderingNo());
if (StringUtils.isNotBlank(params.getOrderingNo())) {
qw.like("bv.orderingNo", params.getOrderingNo());
}
}
@ -1744,7 +1744,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
@Transactional(rollbackFor = Exception.class)
public ResultBean updateVehicleGressionByVin(VehicleGression vehicleGression) {
ResultBean rb = ResultBean.fireFail();
baseMapper.updateVehicleGressionByVin(vehicleGression.getVin(), vehicleGression.getLocation(), vehicleGression.getLocationName());
List<String> vin = vehicleGression.getVin();
for (String s : vin) {
baseMapper.updateVehicleGressionByVin(s, vehicleGression.getLocation(), vehicleGression.getLocationName());
}
return rb.success();
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java
View File

@ -18,6 +18,12 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto {
@ApiModelProperty("保存车辆移库现场照片")
private List<String> images;
@ApiModelProperty("保单照片")
private String policyImages;
@ApiModelProperty("临牌")
private String proCard;
@ApiModelProperty("地址")
private String address;

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
View File

@ -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;

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java
View File

@ -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("审核状态")

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
View File

@ -212,7 +212,7 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
@Override
public ResultBean<AppErtraStateVo> getErtraState(String sid, String userSid) {
return scmVehicleGressionService.getErtraState(sid,userSid);
return scmVehicleGressionService.getErtraState(sid, userSid);
}
@Override

89
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -264,6 +264,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
for (AppScmVehicleGressionPageVo record : records) {
List<String> 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<ScmVehicleGres
return rb.setMsg("该数据不存在");
}
BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
List<String> 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<String> 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<String> 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<ScmVehicleGres
List<String> policyImage = new ArrayList<>();
List<String> 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<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
String vin = StringUtils.join(vins, StringUtils.LF);
vo.setVinNo(vin);
@ -525,19 +547,32 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
@Transactional(rollbackFor = Exception.class)
public ResultBean saveCarTransferSiteImage(AppScmVehicleCarTransferSiteImageDto dto) {
ResultBean rb = ResultBean.fireFail();
String type = "05";
String s1 = "";
scmFileService.deleteByLinkSidAndType(dto.getSid(), type);
String s2 = "";
String type1 = "04";
String type2 = "05";
if (StringUtils.isNotBlank(dto.getPolicyImages())) {
scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
String policyImages = dto.getPolicyImages();
s1 = policyImages.replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setAttachType(type1);
scmFile.setFileName("保单照片");
scmFile.setFilePath(s1);
scmFile.setLinkSid(dto.getSid());
scmFileService.save(scmFile);
}
scmFileService.deleteByLinkSidAndType(dto.getSid(), type2);
List<String> 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<ScmVehicleGres
ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
scmVehicleGression.setAddress(dto.getAddress());
scmVehicleGression.setLocationCode(dto.getLocationCode());
scmVehicleGression.setTemporaryCard(dto.getProCard());
updateById(scmVehicleGression);
return rb.success().setMsg("保存成功");
}
@ -770,7 +806,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
}
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
VehicleGression vehicleGression = new VehicleGression();
vehicleGression.setVin(scmVehicleGression.getVinNo());
List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
vehicleGression.setVin(list);
vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java
View File

@ -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<ScmVehicleGressi
@Select("select * from scm_vehicle_gression_veh where mainSid =#{mainSid} ")
List<ScmVehicleGressionVehDetailsVo> fetchVoByMainSid(@Param("mainSid") String mainSid);
@Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}")
void deleteByMainSid(@Param("sid") String sid);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java
View File

@ -113,4 +113,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
}
return list;
}
public void deleteByMainSid(String sid) {
baseMapper.deleteByMainSid(sid);
}
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java
View File

@ -18,6 +18,12 @@ public class AppCarTransferSiteImageDto implements Dto {
@ApiModelProperty("保存车辆移库现场照片")
private List<String> images;
@ApiModelProperty("保单照片")
private String policyImages;
@ApiModelProperty("临牌")
private String proCard;
@ApiModelProperty("地址")
private String address;

12
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java
View File

@ -84,9 +84,21 @@ public class AppGressionDetailsVo implements Vo {
@ApiModelProperty("保险状态")
private String InsuranceStateKey;
@ApiModelProperty("临牌状态")
private String proCardState;
@ApiModelProperty("临牌状态")
private String proCardStateKey;
@ApiModelProperty("保单照片")
private List<String> policyImage;
@ApiModelProperty("显示保单照片")
private boolean insuranceShow;
@ApiModelProperty("显示临牌文本框")
private boolean proCardShow;
@ApiModelProperty("地址")
private String address;

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
View File

@ -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<String> policyImage;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java
View File

@ -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("状态")

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java
View File

@ -140,11 +140,11 @@ public class AppScmVehicleGressionService {
ResultBean rb = ResultBean.fireFail();
SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto();
BeanUtil.copyProperties(dto, submitCarTransferDto);
//根据车架号查询车辆sid
ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
if (stringResultBean.getSuccess()) {
submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid());
}
// //根据车架号查询车辆sid
// ResultBean<BaseVehicleVo> 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());

Write Preview
Loading…
Cancel
Save