diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index c5e6371f97..998ee8a8a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -69,4 +69,7 @@ public class BaseVehicleOutDto implements Dto { private String middleCodeTwo; @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + + @ApiModelProperty("是否要修改客户") + private String isUpdateOrInsertCrm; // 是否要修改客户 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index 33477c7346..15daec5a0c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -27,6 +27,11 @@ public interface BaseVehicleOutFeign { @ResponseBody public ResultBean vehicleOut(@RequestBody BaseVehicleOutDto dto); + @ApiOperation("是否修改客户编码并车辆出库") + @PostMapping("/isUpdateOrInsertCrm") + @ResponseBody + public ResultBean isUpdateOrInsertCrm(@RequestBody BaseVehicleOutDto dto); + @ApiOperation("车辆出库分页列表") @PostMapping("/pagerList") @ResponseBody diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index bb607e5b4c..19592e99ae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1054,6 +1054,7 @@ AND modelSid = #{modelSid} AND modelConfigSid = #{configSid} AND createOrgSid = #{sellerOrgSid} + AND isDelete = 0 @@ -230,15 +231,15 @@ SELECT count(1) FROM scm_apply_inbound_vehicle WHERE vinNo=#{vinNo} - - AND applySid != #{applySid} -