diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 16d8db60e6..d95231e91a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2232,7 +2232,7 @@ public class BaseVehicleOutService extends MybatisBaseService> selectByApplySid(@RequestParam("sid") String sid); @ApiOperation("查询出库申请单sid") - @PostMapping("/fetchByVehSid") + @PostMapping("/fetchByVehSidAndContractNo") @ResponseBody - ResultBean fetchByVehSid(@RequestParam("vinSid") String vinSid); + ResultBean fetchByVehSidAndContractNo(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java index 1c8e14f664..9bb74e738f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java @@ -76,7 +76,7 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD } @Override - public ResultBean fetchByVehSid(String vinSid) { + public ResultBean fetchByVehSidAndContractNo(String vinSid, String contractNo) { return null; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java index 6d7ccbebbe..73b2d4f6f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java @@ -96,7 +96,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper selectVinSidByApplySid(String sid); - String fetchByVehSid(String vinSid); + String fetchByVehSidAndContractNo(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo); int fetchByIsDeleteVinSid(String vinSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml index a683f37f17..be7936ef90 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml @@ -77,12 +77,13 @@ and bo.contractNo = ba.contractNo - SELECT ba.sid FROM bus_delivered_apply ba JOIN bus_delivered_apply_details bd ON ba.sid = bd.applySid WHERE bd.vinSid = #{vinSid} + AND ba.contractNo = #{contractNo} AND ba.nodeState = '已办结' diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java index 921fc411dc..5d25c51c52 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java @@ -99,7 +99,7 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei } @Override - public ResultBean fetchByVehSid(String vinSid) { - return busDeliveredApplyDetailsService.fetchByVehSid(vinSid); + public ResultBean fetchByVehSidAndContractNo(String vinSid,String contractNo) { + return busDeliveredApplyDetailsService.fetchByVehSidAndContractNo(vinSid,contractNo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index f0e92660ed..41d8f3c161 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -217,9 +217,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService fetchByVehSid(String vinSid) { + public ResultBean fetchByVehSidAndContractNo(String vinSid,String contractNo) { ResultBean rb = ResultBean.fireFail(); - String ckSid = baseMapper.fetchByVehSid(vinSid); + String ckSid = baseMapper.fetchByVehSidAndContractNo(vinSid,contractNo); return rb.success().setData(ckSid); }