diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java index cf2352da3e..5da41e79fa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java @@ -49,13 +49,14 @@ import lombok.Data; @ApiModel(value = "车辆临时状态表 数据传输对象", description = "车辆临时状态表 数据传输对象") public class BaseVehicleTempstateDto implements Dto { - private String sid; // sid + private static final long serialVersionUID = 600474885071180898L; + private String sid; - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("数据字典项key,如移位申请中 001 状态") - private String tempStateKey; // 数据字典项key,如移位申请中 001 状态 - @ApiModelProperty("业务sid") - private String busSid; // 业务sid + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateKey; + @ApiModelProperty("业务sid") + private String busSid; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index 9aaf8857f6..b0a59fcd83 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: comc(comc)
* File: BaseVehicleTempstateFeign.java
@@ -78,4 +80,13 @@ public interface BaseVehicleTempstateFeign { @DeleteMapping("/delByBusSid") @ResponseBody public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid); + + @ApiOperation("查询所有审批中的车架号") + @GetMapping("/selectAll/{s}") + @ResponseBody + ResultBean> selectAll(@PathVariable("s") String s); + @ApiOperation("查询所有审批中的车架号") + @GetMapping("/selectAllOne/{s}") + @ResponseBody + ResultBean> selectAllOne(@PathVariable("s") String s); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java index 5f714cdcf0..103d5d1df2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java @@ -74,4 +74,14 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe public ResultBean delByBusSid(String businessSid) { return null; } + + @Override + public ResultBean> selectAll(String s) { + return null; + } + + @Override + public ResultBean> selectAllOne(String s) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java index 1fd32c6ca5..c3f5c33b99 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java @@ -49,13 +49,13 @@ import lombok.Data; @ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象") public class BaseVehicleTempstateVo implements Vo { - private String sid; // sid + private String sid; - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("数据字典项key,如移位申请中 001 状态") - private String tempStateKey; // 数据字典项key,如移位申请中 001 状态 - @ApiModelProperty("业务sid") - private String busSid; // 业务sid + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateKey; + @ApiModelProperty("业务sid") + private String busSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java index 8c5be40ead..99b2d7706f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -56,4 +56,5 @@ public class BusVehicleApplyDetailsVo implements Vo { private String userSids; private String userNames; + private String nodeState; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java index 6024f10f92..96a15661f0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java @@ -78,4 +78,20 @@ public class DictCommonEnum { } } + @Getter + public static enum ScmFileType { + BD_IMAGE("04", "保单照片"), + XC_IMAGE("05", "现场照片"), + ; + + private final String code; + private final String remarks; + + ScmFileType(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 533f4560a3..95e01def6b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -564,6 +564,7 @@ and bvc.useOrgSid = #{orgSid} + and length(bvc.guidedPrice)>0 ORDER BY nowCarNum DESC 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 f0cedaeeee..eb8040ded0 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 @@ -572,7 +572,7 @@ (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid - AND bvc.useOrgSid = #{useOrgSid}) AS + AND bvc.useOrgSid = #{useOrgSid} and length(bvc.guidedPrice)>0) AS configNum, (SELECT count(*) FROM base_vehicle bv diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 35d067ad61..f553bbc4d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -16,6 +16,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService; import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; import com.yxt.anrui.base.common.enums.OperVehicleState; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; @@ -28,7 +29,10 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -88,6 +92,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { */ @Autowired private FinKingDeeFeign finKingDeeFeign; + @Autowired + private BaseVehicleTempstateService baseVehicleTempstateService; + @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -842,7 +849,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.setMsg("用户sid不能为空"); } PagerVo page = new PagerVo<>(); - IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery); + //查询在申请的存放地点变更车辆的车辆sid + List stringList = baseVehicleTempstateService.selectAll("001"); + IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList); PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); return new ResultBean>().success().setData(pagerVo); } 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 996dd73c4d..91c752f7f4 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 @@ -1434,7 +1434,7 @@ public class BaseVehicleService extends MybatisBaseService> getVinByWarehouseSid(String warehouseSid, String userSid) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); - List carSidList = baseVehicleTempstateService.selectAll(); + List carSidList = baseVehicleTempstateService.selectAll("001"); ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); if (StringUtils.isNotBlank(resultBean.getData())) { qw.eq("bv.createOrgSid", resultBean.getData()); @@ -1769,7 +1769,7 @@ public class BaseVehicleService extends MybatisBaseService getPcVinByWarehouseSid(PagerQuery pagerQuery) { + public IPage getPcVinByWarehouseSid(PagerQuery pagerQuery, List vinList) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = new QueryWrapper(); VinByWarehouseQuery params = pagerQuery.getParams(); @@ -1784,6 +1784,9 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bv.vinNo", params.getVins()); } + if (vinList.size() > 0) { + qw.notIn("bv.sid", vinList); + } qw.eq("bv.isDelete", 0); //库存或调入或采购退库中 qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode())); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java index 9f36382c09..7565988222 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java @@ -62,10 +62,12 @@ public interface BaseVehicleTempstateMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_vehicle_tempstate") - List selectListVo(); + @Select("select * from base_vehicle_tempstate where tempStateKey = #{state} ") + List selectListVo(String state); @Delete("delete from base_vehicle_tempstate where busSid=#{businessSid}") void deleteByBusSid(@Param("businessSid") String businessSid); + @Select("select * from base_vehicle_tempstate where tempStateKey = #{state} ") + List selectAllOne(String s); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java index 86ee6f35de..3fff9ffad3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: comc(comc)
@@ -98,4 +100,18 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign { baseVehicleTempstateService.delByBusSid(businessSid); return rb.success(); } + + @Override + public ResultBean> selectAll(String s) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseVehicleTempstateService.selectAllOne(s); + return rb.success().setData(stringList); + } + + @Override + public ResultBean> selectAllOne(String s) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseVehicleTempstateService.selectAll(s); + return rb.success().setData(stringList); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java index 34c64b2f51..d54a22d901 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java @@ -29,14 +29,11 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicletempstate.*; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -109,9 +106,9 @@ public class BaseVehicleTempstateService extends MybatisBaseService selectAll() { + public List selectAll(String state) { List list = new ArrayList<>(); - List baseVehicleTempstateVos = baseMapper.selectListVo(); + List baseVehicleTempstateVos = baseMapper.selectListVo(state); if (baseVehicleTempstateVos.size() > 0) { for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) { list.add(baseVehicleTempstateVo.getVehSid()); @@ -119,4 +116,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService selectAllOne(String s) { + return baseMapper.selectAllOne(s); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index bb429d6cd4..c4f8575832 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -90,7 +90,7 @@ , #{names} , '%') - order by id + order by id desc diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 86c681ce8c..b258baa7c4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java @@ -70,7 +70,7 @@ public interface FinPaymentrecordFeign { ResultBean update(@RequestBody FinPaymentrecordUpdateDto dto); @ApiOperation("作废") - @PutMapping("/updateState/{sid}") + @PostMapping("/updateState") @ResponseBody - ResultBean updateState(@PathVariable("sid")String sid); + ResultBean updateState(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java index 1582131aaa..3b775375e0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java @@ -66,7 +66,7 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign { } @Override - public ResultBean updateState(String sid) { + public ResultBean updateState(String[] sids) { return null; } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java index a6ff9cb5a6..0b16ddb732 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java @@ -65,7 +65,7 @@ public interface FinPaymentrecordMapper extends BaseMapper { List selectApplySids(@Param("list") List sids); - int updateStateBySid(@Param("sid") String sid, @Param("state") int i); + int updateStateBySid(@Param("sid")String sid, @Param("state") int i); List selectApplySidBySid(List sids); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index d2abe5608e..fac18a24e4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -12,7 +12,8 @@ fp.payRemark, case fp.state when 1 then '未支付' - when 2 then '已支付' end as state, + when 2 then '已支付' + when 3 then '作废' end as state, DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, fp.busSid billNo, fp.costTitleValue, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index bc430d871a..f508d1b341 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java @@ -73,7 +73,7 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { } @Override - public ResultBean updateState(String sid) { - return finPaymentrecordService.updateState(sid); + public ResultBean updateState(String[] sids) { + return finPaymentrecordService.updateState(sids); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 9e12d9ddb7..dcf276dd4f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -31,6 +31,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; import com.yxt.anrui.fin.api.finpaymentrecord.*; @@ -49,6 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -78,6 +82,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -126,7 +132,6 @@ public class FinPaymentrecordService extends MybatisBaseService sids = dto.getSids(); //判断选择的sids的付款申请的收款单位是否一致 List applySids = baseMapper.selectApplySids(sids); -// List applyCodes = finPaymentapplyService.selectCodeBySid(applySids); if (applySids.size() > 1) { applySids = applySids.stream().distinct().collect(Collectors.toList()); if (applySids.size() > 1) { @@ -246,17 +251,34 @@ public class FinPaymentrecordService extends MybatisBaseService sidsList = Arrays.asList(sids); + for (String s : sidsList) { + FinPaymentrecord finPaymentrecord = fetchBySid(s); + if (!DictCommonEnum.costType.CG_TYPE.getCode().equals(finPaymentrecord.getCostTypeKey())) { + return rb.setMsg("选择的数据中包含款项类别非排产的数据"); + } else { + ResultBean resultBean = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()); + BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = resultBean.getData(); + if (busVehicleApplyDetailsVo != null) { + if (!"作废".equals(busVehicleApplyDetailsVo.getNodeState())) { + return rb.setMsg("选择的数据中包含未作废的厂家采购"); + } + } + } + if (finPaymentrecord.getState() == 2) { + return rb.setMsg("选择的数据中包含已打款的数据，不能作废"); + } + } + for (String s : sidsList) { + int i = baseMapper.updateStateBySid(s, 3); } - int i = baseMapper.updateStateBySid(sid, 3); return rb.success(); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java index b5486e8fc3..007f7ca771 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-scm(专项返利管理)
* File: ScmSpecialRebateFeignFallback.java
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 15c4c2380b..0698099b28 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 @@ -52,40 +52,41 @@ import java.util.List; @ApiModel(value = "移位单 视图数据详情", description = "移位单 视图数据详情") public class AppScmVehicleGressionDetailsVo implements Vo { - private String sid; // sid + private static final long serialVersionUID = -8794600411504248824L; + /*private String sid; @ApiModelProperty("车辆sid") - private String vehicleSid; // 车辆sid + private String vehicleSid; @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private String vinNo; @ApiModelProperty("车架号") - private List vins; // 车架号 + private List vins;*/ @ApiModelProperty("申请编号") - private String applicantNo; // 申请编号 + private String applicantNo; @ApiModelProperty("申请人") private String applicantName; @ApiModelProperty("申请编日期") private String applicantDate; @ApiModelProperty("现存地点") - private String location; // 现存地点 + private String location; @ApiModelProperty("现存地点") private String locationSid; - @ApiModelProperty("现存地点") - private String locationKey; + /* @ApiModelProperty("现存地点") + private String locationKey;*/ @ApiModelProperty("目标地点") - private String targetLocation; // 目标地点 + private String targetLocation; @ApiModelProperty("目标地点") private String targetLocationSid; - @ApiModelProperty("目标地点") - private String targetLocationKey; + /* @ApiModelProperty("目标地点") + private String targetLocationKey;*/ @ApiModelProperty("变更原因") - private String changeReason; // 变更原因 + private String changeReason; @ApiModelProperty("申请经费") - private String applicantFunds; // 申请经费 + private String applicantFunds; @ApiModelProperty("经办人") - private String operator; // 经办人 + private String operator; @ApiModelProperty("保险状态") - private String InsuranceState; // 保险状态 + private String InsuranceState; @ApiModelProperty("保险状态") private String InsuranceStateKey; @ApiModelProperty("临牌状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java index 74a388848b..0314848f00 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java @@ -55,29 +55,14 @@ public class AppScmVehicleGressionDto implements Dto { private static final long serialVersionUID = -5753948406322577902L; private String sid; + @ApiModelProperty("用户sid") private String userSid; -// @ApiModelProperty("车辆sid") -// private String vehicleSid; -// @ApiModelProperty("车架号") -// private String vinNo; -// @ApiModelProperty("车架号") -// private List vins; - @ApiModelProperty("申请编号") - private String applicantNo; - // @ApiModelProperty("申请人") -// private String applicantName; -// @ApiModelProperty("申请日期") -// private String applicantDate; @ApiModelProperty("现存地点") private String location; - @ApiModelProperty("现存放地点") - private String locationKey; @ApiModelProperty("现存放地点sid") private String locationSid; @ApiModelProperty("目标地点") private String targetLocation; - @ApiModelProperty("目标库") - private String targetLocationKey; @ApiModelProperty("目标库sid") private String targetLocationSid; @ApiModelProperty("变更原因") @@ -99,14 +84,6 @@ public class AppScmVehicleGressionDto implements Dto { private String proCardState; @ApiModelProperty("临牌状态") private String proCardStateKey; -// @ApiModelProperty("临牌") -// private String temporaryCard; -// @ApiModelProperty("保单照片") -// private List policyImage; - - @ApiModelProperty("车架号") - private List scmVehicleGressionVehs; - @ApiModelProperty("调出方负责人名称") private String staffName; @ApiModelProperty("调出方负责人用户sid") @@ -115,5 +92,28 @@ public class AppScmVehicleGressionDto implements Dto { private String address; @ApiModelProperty("经纬度") private String locationCode; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + // @ApiModelProperty("车辆sid") +// private String vehicleSid; +// @ApiModelProperty("车架号") +// private String vinNo; +// @ApiModelProperty("车架号") +// private List vins; + /* @ApiModelProperty("申请编号") + private String applicantNo;*/ + // @ApiModelProperty("申请人") +// private String applicantName; +// @ApiModelProperty("申请日期") +// private String applicantDate; +/* @ApiModelProperty("现存放地点") + private String locationKey;*/ + /* @ApiModelProperty("目标库") + private String targetLocationKey;*/ +// @ApiModelProperty("临牌") +// private String temporaryCard; +// @ApiModelProperty("保单照片") +// private List policyImage; + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java index bfdd483443..a6b57e1e0e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java @@ -33,7 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; +import java.util.ArrayList; import java.util.List; /** @@ -53,41 +53,34 @@ import java.util.List; @ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象") public class AppScmVehicleGressionInfoVo implements Vo { - private String sid; // sid - - @ApiModelProperty("车辆sid") - private String vehicleSid; // 车辆sid - @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private static final long serialVersionUID = 4484553821363324415L; + private String sid; @ApiModelProperty("车架号") - private List vins; // 车架号 + private List vins; @ApiModelProperty("申请编号") - private String applicantNo; // 申请编号 + private String applicantNo; @ApiModelProperty("申请人") private String applicantName; @ApiModelProperty("申请编日期") private String applicantDate; @ApiModelProperty("现存地点") - private String location; // 现存地点 + private String location; @ApiModelProperty("现存地点") private String locationSid; - @ApiModelProperty("现存地点") - private String locationKey; @ApiModelProperty("目标地点") - private String targetLocation; // 目标地点 + private String targetLocation; @ApiModelProperty("目标地点") private String targetLocationSid; - @ApiModelProperty("目标地点") - private String targetLocationKey; + @ApiModelProperty("变更原因") - private String changeReason; // 变更原因 + private String changeReason; @ApiModelProperty("申请经费") - private String applicantFunds; // 申请经费 + private String applicantFunds; @ApiModelProperty("经办人") - private String operator; // 经办人 + private String operator; @ApiModelProperty("保险状态") @JsonProperty("InsuranceState") - private String InsuranceState; // 保险状态 + private String InsuranceState; @ApiModelProperty("保险状态") @JsonProperty("InsuranceStateKey") private String InsuranceStateKey; @@ -96,28 +89,36 @@ public class AppScmVehicleGressionInfoVo implements Vo { @ApiModelProperty("临牌状态") private String proCardStateKey; @ApiModelProperty("临牌") - private String temporaryCard; // 临牌 + private String temporaryCard; @ApiModelProperty("审核状态") private String nodeState; @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实例id") private String procInstId; - - @ApiModelProperty("车架号") - private List scmVehicleGressionVehs; - @ApiModelProperty("保单照片") - private List policyImage; + private List policyImage = new ArrayList<>(); @ApiModelProperty("现场照片") - private List image; - + private List image = new ArrayList<>(); @ApiModelProperty("调出方负责人名称") private String staffName; @ApiModelProperty("调出方负责人用户sid") private String personUserSid; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs = new ArrayList<>(); + + /* @ApiModelProperty("车辆sid") + private String vehicleSid; + @ApiModelProperty("车架号") + private String vinNo;*/ + +/* @ApiModelProperty("现存地点") + private String locationKey;*/ + + /* @ApiModelProperty("目标地点") + private String targetLocationKey;*/ + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java index 1e77163a75..c20924eb99 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; - /** * Project: scm(scm)
* File: ScmVehicleGression.java
@@ -52,54 +50,47 @@ import javax.validation.constraints.NotBlank; public class ScmVehicleGression extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("车辆sid") - private String vehicleSid; // 车辆sid - @ApiModelProperty("车架号") - private String vinNo; // 车架号 @ApiModelProperty("申请编号") - private String applicantNo; // 申请编号 + private String applicantNo; @ApiModelProperty("现存地点") - private String location; // 现存地点 - @ApiModelProperty("现存放地点") - private String locationKey; + private String location; @ApiModelProperty("现存放地点sid") private String locationSid; @ApiModelProperty("目标地点") - private String targetLocation; // 目标地点 - @ApiModelProperty("目标库") - private String targetLocationKey; + private String targetLocation; @ApiModelProperty("目标库sid") private String targetLocationSid; @ApiModelProperty("变更原因") - private String changeReason; // 变更原因 + private String changeReason; @ApiModelProperty("申请经费") - private String applicantFunds; // 申请经费 + private String applicantFunds; @ApiModelProperty("经办人") - private String operator; // 经办人 - @ApiModelProperty("保险状态") - private String InsuranceState; // 保险状态 + private String operator; @ApiModelProperty("保险状态") - private String InsuranceStateKey; // 保险状态 - @ApiModelProperty("临牌状态") - private String proCardState; - @ApiModelProperty("临牌状态") - private String proCardStateKey; - @ApiModelProperty("临牌") - private String temporaryCard; // 临牌 - @ApiModelProperty("申请状态（代办已办）") - private String handleState; - @ApiModelProperty("分公司sid") - private String useOrgSid; - @ApiModelProperty("部门sid") - private String orgSid; + private String InsuranceState; + @ApiModelProperty("保险状态key") + private String InsuranceStateKey; @ApiModelProperty("申请人") - private String applicantName; // 申请人 + private String applicantName; @ApiModelProperty("申请日期") - private String applicantDate; // 申请日期 + private String applicantDate; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("临牌牌照号") + private String temporaryCard; @ApiModelProperty("地址") private String address; @ApiModelProperty("经纬度") private String locationCode; + @ApiModelProperty("调出方负责人名称") + private String staffName; + @ApiModelProperty("调出方负责人用户sid") + private String personUserSid; + @ApiModelProperty("临牌状态") + private String proCardState; + @ApiModelProperty("临牌状态") + private String proCardStateKey; + @ApiModelProperty(value = "节点状态") private String nodeState; @@ -112,9 +103,15 @@ public class ScmVehicleGression extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; - @ApiModelProperty("调出方负责人名称") - private String staffName; - @ApiModelProperty("调出方负责人用户sid") - private String personUserSid; + + @ApiModelProperty("申请状态（代办已办）") + private String handleState; + /* @ApiModelProperty("现存放地点sid") + private String locationKey;*/ + /* @ApiModelProperty("目标库") + private String targetLocationKey;*/ + /* @ApiModelProperty("部门sid") + private String orgSid;*/ + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java index 0b1ff199e6..6e630ba214 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java @@ -60,7 +60,7 @@ import java.util.List; fallback = ScmVehicleGressionFeignFallback.class) public interface ScmVehicleGressionFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -78,14 +78,14 @@ public interface ScmVehicleGressionFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);*/ @ApiOperation("PC端-获取车辆移位列表") @PostMapping("/selectCarTransferList") @ResponseBody public ResultBean> selectCarTransferList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("PC端-获取车辆移位记录") + @ApiOperation("PC端-获取车辆移位记录-车辆台账") @PostMapping("/selectCarTransferListAll") @ResponseBody public ResultBean> selectCarTransferListAll(@RequestBody PagerQuery pagerQuery); @@ -101,10 +101,10 @@ public interface ScmVehicleGressionFeign { @ResponseBody public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端-保存车库移库信息") + @ApiOperation("移动端、PC端-保存车库移库信息") @PostMapping("/saveCarTransferInfo") @ResponseBody - public ResultBean saveCarTransferInfo(@RequestBody AppScmVehicleGressionDto dto); + public ResultBean saveCarTransferInfo(@Valid @RequestBody AppScmVehicleGressionDto dto); @ApiOperation("手机端-初始化移库申请") @GetMapping("/getCarTransferInfo/{sid}/{userSid}") @@ -121,7 +121,7 @@ public interface ScmVehicleGressionFeign { @ResponseBody public ResultBean deleteCarTransfer(@PathVariable("sid") String sid); - @ApiOperation("手机端-保存 车辆移库 现场照片") + @ApiOperation("手机端-保存 车辆移库 现场照片(补录)") @PostMapping("/saveCarTransferSiteImage") @ResponseBody public ResultBean saveCarTransferSiteImage(@RequestBody AppScmVehicleCarTransferSiteImageDto dto); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java index ed412a3279..f18f3cd332 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java @@ -50,7 +50,7 @@ import java.util.List; @Component public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问"); @@ -70,7 +70,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign public ResultBean fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问"); - } + }*/ @Override public ResultBean> selectCarTransferList(PagerQuery pagerQuery) { @@ -93,7 +93,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign } @Override - public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) { + public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) { return null; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java index 6c2e7b1b94..dcf9eefd54 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java @@ -50,17 +50,17 @@ import lombok.Data; public class ScmVehicleGressionVeh extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("移位申请单sid") - private String mainSid; // 移位申请单sid - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("车架号") - private String vehVin; // 车架号 - @ApiModelProperty("买断状态key") - private String settlementStatus; // 买断状态key - @ApiModelProperty("买断状态value") - private String settlementStatusValue; // 买断状态value - @ApiModelProperty("临时牌照号码") - private String temporaryCardNo; // 临时牌照号码 + @ApiModelProperty("移位申请单sid") + private String mainSid; + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车架号") + private String vehVin; + @ApiModelProperty("买断状态key") + private String settlementStatus; + @ApiModelProperty("买断状态value") + private String settlementStatusValue; +/* @ApiModelProperty("临时牌照号码") + private String temporaryCardNo;*/ } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java index fe8e9092e5..c34508a00a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java @@ -49,19 +49,21 @@ import lombok.Data; @ApiModel(value = "移位申请单车架号库 数据传输对象", description = "移位申请单车架号库 数据传输对象") public class ScmVehicleGressionVehDto implements Dto { - private String sid; // sid + private static final long serialVersionUID = 5127074370901912347L; - @ApiModelProperty("移位申请单sid") - private String mainSid; // 移位申请单sid @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid + private String vehSid; @ApiModelProperty("车架号") - private String vehVin; // 车架号 + private String vehVin; @ApiModelProperty("买断状态key") - private String settlementStatus; // 买断状态key + private String settlementStatus; @ApiModelProperty("买断状态value") - private String settlementStatusValue; // 买断状态value - @ApiModelProperty("临时牌照号码") - private String temporaryCardNo; // 临时牌照号码 + private String settlementStatusValue; +/* @ApiModelProperty("临时牌照号码") + private String temporaryCardNo;*/ + /*private String sid;*/ + +/* @ApiModelProperty("移位申请单sid") + private String mainSid;*/ } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java index 56acc73fb9..68d8b1e298 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java @@ -26,14 +26,7 @@ package com.yxt.anrui.scm.api.scmvehiclegressionveh; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -import java.util.List; /** * Project: abc(abc)
@@ -50,29 +43,11 @@ import java.util.List; */ @Api(tags = "移位申请单车架号库") @FeignClient( - contextId = "abc-ScmVehicleGressionVeh", - name = "abc", + contextId = "anrui-scm-ScmVehicleGressionVeh", + name = "anrui-scm", path = "v1/scmvehiclegressionveh", fallback = ScmVehicleGressionVehFeignFallback.class) public interface ScmVehicleGressionVehFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ScmVehicleGressionVehDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java index 5b0da58a74..6f0d1ff9a3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java @@ -48,25 +48,5 @@ import java.util.List; @Component public class ScmVehicleGressionVehFeignFallback implements ScmVehicleGressionVehFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口abc/scmvehiclegressionveh/listPage无法访问"); - } - - @Override - public ResultBean save(ScmVehicleGressionVehDto dto){ - return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口abc/scmvehiclegressionveh/fetchDetailsBySid无法访问"); - } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java index 1bdfa5f2e7..e865876978 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java @@ -47,21 +47,22 @@ import lombok.Data; */ @Data @ApiModel(value = "移位申请单车架号库 视图数据对象", description = "移位申请单车架号库 视图数据对象") -public class ScmVehicleGressionVehVo implements Vo { +public class ScmVehicleGressionVehVo implements Vo { - private String sid; // sid + private static final long serialVersionUID = 2859343326484666520L; + /* private String sid;*/ - @ApiModelProperty("移位申请单sid") - private String mainSid; // 移位申请单sid +/* @ApiModelProperty("移位申请单sid") + private String mainSid;*/ @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid + private String vehSid; @ApiModelProperty("车架号") - private String vehVin; // 车架号 + private String vehVin; @ApiModelProperty("买断状态key") - private String settlementStatus; // 买断状态key + private String settlementStatus; @ApiModelProperty("买断状态value") - private String settlementStatusValue; // 买断状态value - @ApiModelProperty("临时牌照号码") - private String temporaryCardNo; // 临时牌照号码 + private String settlementStatusValue; +/* @ApiModelProperty("临时牌照号码") + private String temporaryCardNo;*/ } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 5fc43c1e48..bfc55bd077 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -559,8 +559,8 @@ public class ScmVehicleExamineService extends MybatisBaseService * 手机端-初始化移库申请 * * @param sid - * @param useOrgSid * @return */ - AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid, @Param("useOrgSid") String useOrgSid); + AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid); /** * 手机端-车库移库详情 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index a0cfedc0ee..f8eafce122 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -75,7 +75,6 @@ SELECT * FROM scm_vehicle_gression svg WHERE svg.sid = #{sid} - AND svg.useOrgSid = #{useOrgSid}