diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java index e0533e3463..0591c8bde1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java @@ -46,7 +46,7 @@ public interface BusTransferRecordsFeign { @ApiOperation("根据接收人sid以及车辆sid查询是否有待接收记录") @GetMapping("/selectByVinSid") - ResultBean selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid,@RequestParam("goodsTypeKey") String goodsTypeKey); + ResultBean selectByVinSid(@RequestParam("contractNo") String contractNo,@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid,@RequestParam("goodsTypeKey") String goodsTypeKey); @ApiOperation("根据来源sid删除") @PostMapping("/delBySourceSid") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index e13f843f5b..e585d525a3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -1082,10 +1082,10 @@ public class BusHandoverService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode()); + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode()); if (busTransferRecordsResultBean.getData() == null) { return rb.setMsg("发票未准备好"); } else { @@ -348,7 +348,7 @@ public class BusHandoverPrepareService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode()); + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode()); if (busTransferRecordsResultBean.getData() == null) { return rb.setMsg("合格证未准备好"); } else { @@ -670,7 +670,7 @@ public class BusHandoverPrepareService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode()); + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode()); if (busTransferRecordsResultBean.getData() != null) { BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData(); busTransferRecords.setReceiveRemarks(dto.getRemarks()); @@ -700,7 +700,7 @@ public class BusHandoverPrepareService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode()); + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode()); if (busTransferRecordsResultBean.getData() != null) { BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData(); busTransferRecords.setReceiveRemarks(dto.getRemarks()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java index c8ba686e4e..4af3781b6e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java @@ -131,13 +131,13 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode()); + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode()); if (busTransferRecordsResultBean.getData() != null && !vo.isCertificateState()) { vo.setCertificateStateStr("原件接收确认"); } //判断发票是否准备好 //根据车辆sid以及销售专员的用户sid查询是否有待接收的记录 - busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode()); + busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode()); if (busTransferRecordsResultBean.getData() != null && !vo.isInvoicingState()) { vo.setInvoicingStateStr("原件接收确认"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java index c8af752f16..9a97a0ea4c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java @@ -24,7 +24,7 @@ import java.util.List; public interface BusTransferRecordsMapper extends BaseMapper { IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("list") List roleSidList); - BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey); + BusTransferRecords selectByVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey); @Delete("DELETE FROM bus_transfer_records WHERE goodsSid = #{sourceSid}") void delBySourceSid(String sourceSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml index a5e52f4c9c..cbfb2fe33d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml @@ -34,6 +34,10 @@ where vinSid = #{vinSid} and receiveSid = #{userSid} and goodsTypeKey = #{typeKey} + + and contractNo = #{contractNo} + + order by id desc limit 1