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

修改验车和入库推送车辆台账接口,验车问题修改

master
hp 3 years ago
parent
695b1c49e7
commit
cef8d6c252
10 changed files with 58 additions and 20 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. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  3. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java
  4. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java
  5. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java
  6. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
  7. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  8. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  9. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  10. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -405,6 +405,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(bv.getBusinessSid());
for (BaseInternalPurchaseVehicleVo booad : baseInternalPurchaseVehicleVos) {
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
scmEntryVehicleExamineDto.setBusinessSid(booad.getMainSid());
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -451,6 +451,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(bv.getBusinessSid());
for (BaseOutsourcingApplicationVehicleVo baseOutsourcingApplicationVehicleVo : baseOutsourcingApplicationVehicleVos) {
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
//外采sid
scmEntryVehicleExamineDto.setBusinessSid(baseOutsourcingApplicationVehicleVo.getOutAppSid());
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java
View File

@ -92,4 +92,13 @@ public class AppScmVehicleEnterlibraryCarWarehousingDto implements Dto {
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("业务sid")
private String businessSid;
@ApiModelProperty("保修卡号")
private String warrantyCardNo;
@ApiModelProperty("特殊或差异说明")
private String specialInstructions;
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java
View File

@ -78,6 +78,8 @@ public class ScmVehicleEnterlibrary extends BaseEntity {
private String inbound; // 入库人
@ApiModelProperty("存放地点")
private String location; // 存放地点
@ApiModelProperty("存放地点")
private String locationSid ;
@ApiModelProperty("仓库管理员")
private String storekeeper; // 仓库管理员
@ApiModelProperty("地址")
@ -90,5 +92,11 @@ public class ScmVehicleEnterlibrary extends BaseEntity {
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("业务sid")
private String businessSid;
@ApiModelProperty("保修卡号")
private String warrantyCardNo;
@ApiModelProperty("特殊或差异说明")
private String specialInstructions;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java
View File

@ -38,4 +38,6 @@ public class ScmEntryVehicleExamineDto implements Dto {
@ApiModelProperty("验车状态（已验车，未验车）")
private String inspectionResult; // 验车状态（已验车，未验车）
@ApiModelProperty("外采 排产 调车 sid")
private String businessSid;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
View File

@ -96,5 +96,7 @@ public class ScmVehicleExamine extends BaseEntity {
private String guaranteeCardNo; // 保修卡卡号
@ApiModelProperty("保存状态（默认为0 未操作 1 已保存）")
private int saveStatus;
@ApiModelProperty("外采 排产 调车 sid")
private String businessSid;
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -421,6 +421,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
//验车数据推送
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
scmEntryVehicleExamineDto.setBusinessSid(businessSid);
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
View File

@ -30,6 +30,8 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.VehicleEnterlibrary;
@ -90,6 +92,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
@Autowired
FileUploadComponent fileUploadComponent;
@Autowired
BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -273,6 +278,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
scmVehicleEnterlibrary.setAddressCode(dto.getLocation());
scmVehicleEnterlibrary.setInboundState("2");
scmVehicleEnterlibrary.setLocation(dto.getWarehouse());
scmVehicleEnterlibrary.setLocationSid(dto.getWarehouseKey());
scmVehicleEnterlibrary.setStorekeeper(data.getStaffName());
baseMapper.updateById(scmVehicleEnterlibrary);
VehicleEnterlibrary vehicleEnterlibrary = new VehicleEnterlibrary();
@ -293,7 +299,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
scmFileService.save(scmFile1);
}
//车辆台账推送数据
String businessSid = scmVehicleEnterlibrary.getBusinessSid();
//排产
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
@ -316,24 +322,25 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
baseVehicleDto.setContractPrice(0); // 待确定
baseVehicleDto.setCostPrice(0);// 待确定
baseVehicleDto.setOrderingNo(""); // 采购编号
BaseOutsourcingApplicationDetailsVo applicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(businessSid).getData();
baseVehicleDto.setContractPrice(Integer.valueOf(applicationDetailsVo.getManufactorSettlementPrice())); // 厂家合同价
baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid
baseVehicleDto.setLocationName(dto.getWarehouse());//库存地点
baseVehicleDto.setWarrantyCardNo("");// 保修卡号 验车
baseVehicleDto.setSpecialInstructions(""); // 特殊差异说明 验车
baseVehicleDto.setLocation(scmVehicleEnterlibrary.getLocationSid()); //库存地点sid
baseVehicleDto.setLocationName(scmVehicleEnterlibrary.getLocation());//库存地点
baseVehicleDto.setWarrantyCardNo(scmVehicleEnterlibrary.getWarrantyCardNo());// 保修卡号 验车
baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
List<BaseVehicleDto> list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());
}
if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())){
if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin());
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -476,6 +476,10 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
baseMapper.updateById(scmVehicleExamine);
// 通过验车 并保存入库单
AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto();
// 业务sid
carWarehousingDto.setBusinessSid(scmVehicleExamine.getBusinessSid());
carWarehousingDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo());
carWarehousingDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain());
//车架号
carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo());
carWarehousingDto.setModelName(scmVehicleExamine.getModelName());

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java
View File

@ -107,25 +107,24 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
if (vos.size() <= 0) {
return rb.setMsg("该验车项目不存在");
}
Integer result = null;
List<ScmResultImageDto> scmResultImageDtos = dto.getScmResultImageDtos();
for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) {
result = scmResultImageDto.getResult();
baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult());
Integer result = scmResultImageDto.getResult();
if (result == 0) {
if (StringUtils.isBlank(scmResultImageDto.getRemarks())) {
return rb.setMsg("备注不能为空");
}
}
List<ScmVehinspectItemimgDto> itemImgVoList = scmResultImageDto.getItemImgVoList();
for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) {
String mainSid = scmVehinspectItemimgDto.getMainSid();
if (result == 0) {
ScmVehinspectItemimg scmVehinspectItemimg = scmVehinspectItemimgService.fetchBySid(mainSid);
if (StringUtils.isBlank(scmResultImageDto.getRemarks())) {
return rb.setMsg("备注不能为空哦");
}
if (scmVehinspectItemimg != null) {
List<String> imgUrlList = scmVehinspectItemimgDto.getImgUrlList();
if (imgUrlList.size() <= 0) {
return rb.setMsg("图片不能为空哦");
if (imgUrlList.size() == 0) {
return rb.setMsg("图片不能为空");
}
}
}
@ -137,6 +136,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
scmVehinspectItemimgDto.setImgUrl(imgUrl);
scmVehinspectItemimgService.updateByMainSid(scmVehinspectItemimgDto.getMainSid(), scmVehinspectItemimgDto.getImgUrl(), scmVehinspectItemimgDto.getImgTitle());
}
baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult());
}
return rb.success().setMsg("保存成功");
}
@ -216,7 +216,9 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
return rb.setMsg("该验车项目不存在");
}
if (dto.getResult() == 0) {
return rb.setMsg("备注不能为空哦");
if(StringUtils.isBlank(dto.getRemarks())){
return rb.setMsg("备注不能为空");
}
}
baseMapper.updateByVehInspectSid(dto.getSid(), dto.getRemarks(), dto.getResult());
String imgUrls = "";

Write Preview
Loading…
Cancel
Save