diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java index 20b2758cfb..f158f55d24 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java @@ -53,6 +53,10 @@ public interface BusVehicleApplyDetailFeign { @GetMapping("/fetchSid/{sid}") public ResultBean fetchSid(@PathVariable("sid") String sid); + @ApiOperation("根据厂家采购sid、车型sid、配置sid查询车辆型号") + @GetMapping("/fetchVehNoByMMCSid/{mainSid}/{modelSid}/{configSid}") + public ResultBean fetchVehNoByMMCSid(@PathVariable("mainSid") String mainSid,@PathVariable("modelSid") String modelSid,@PathVariable("configSid") String configSid); + @ApiOperation("查询车型sid") @GetMapping("/selModel/{sid}") public ResultBean selModel(@PathVariable("sid") String sid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java index 25e4f685e2..ec549b09b3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java @@ -50,6 +50,11 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail return null; } + @Override + public ResultBean fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) { + return null; + } + @Override public ResultBean selModel(String sid) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 2f0bb293eb..781c63dbca 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -685,6 +685,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService getVehicleApply(String sid); + + List fetchVehNoByMMCSid(@Param("mainSid") String mainSid,@Param("modelSid") String modelSid,@Param("configSid") String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 1dc25b7eb7..fbecaa882a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -5,16 +5,16 @@ select bo.sid linkSid, bo.orderNo linkNo, bo.orderDate linkText, bo.platformNo, bo.lockingNum from bus_vehicle_apply_detail bd - left join bus_vehicle_apply bv on bd.applySid = bv.sid - left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid - ${ew.customSqlSegment} + left join bus_vehicle_apply bv on bd.applySid = bv.sid + left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java index 8a4091c7da..2dd25aa67e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java @@ -76,6 +76,11 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign { return rb.success().setData(vo); } + @Override + public ResultBean fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) { + return busVehicleApplyDetailService.fetchVehNoByMMCSid(mainSid,modelSid,configSid); + } + @Override public ResultBean selModel(String sid) { BusVehicleApplyDetailVo vo = busVehicleApplyDetailService.selModel(sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java index 580d5a1de6..df8f09a2f2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java @@ -274,4 +274,11 @@ public class BusVehicleApplyDetailService extends MybatisBaseService getVehicleApply(String sid) { return baseMapper.getVehicleApply(sid); } + + public ResultBean fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) { + ResultBean rb = ResultBean.fireFail(); + List stringList = baseMapper.fetchVehNoByMMCSid(mainSid, modelSid, configSid); + String vehicleNo = stringList.get(0); + return rb.success().setData(vehicleNo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ef278b91ea..36f21dc630 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -757,27 +757,27 @@ public class CommonContractService extends MybatisBaseService qw = createOrderAppPageWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.pageAppList(page, qw, query.getName()); + IPage pagging = baseMapper.pageAppList(page, qw, query.getNames()); List list = pagging.getRecords(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -2185,7 +2185,7 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) { + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); @@ -2197,7 +2197,7 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) { + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); @@ -2240,7 +2240,7 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())) { + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index f56780dfda..2575bc8d9f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -150,13 +150,18 @@ public class BusSalesOrderMakeupService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -528,13 +533,14 @@ public class ScmApplyInboundService extends MybatisBaseService