diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java index 7e5f2c0d19..9ce3c72e8a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java @@ -78,6 +78,7 @@ public interface BusDeliveredMapper extends BaseMapper { * @return */ IPage getRetrievalNotList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); /** * 查询车架号 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 5abae9bed0..57f269701b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -51,10 +51,55 @@ , #{name} , '%') - and (select count (*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid) - >0 - and bo.contractNo = bd.contractNo) - >0 + AND ( + SELECT + count(*) + FROM + bus_sales_order_vehicle bbv + LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid + WHERE + length( bbv.linkSid )> 0 + AND bo.contractNo = bd.contractNo + )> 0 + + group by bd.contractNo + + + + + + + + + + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 2eed9f28dc..5df7bed883 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -271,6 +271,35 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalNotLists(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + String name = pq.getParams().getName(); + IPage page = PagerUtil.queryToPage(pq); + String orgPath = pq.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); + } + qw.eq("bd.useOrgSid", orgSid); + qw.eq("bd.state", 1); + if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { + qw.eq("bd.createBySid", pq.getParams().getUserSid()); + } + IPage iPage = baseMapper.getRetrievalNotLists(page, qw, name); + for (AppBusDeliveredPageVo record : iPage.getRecords()) { + String contractNo = record.getContractNo(); + QueryWrapper qw2 = new QueryWrapper<>(); + //待出库:1,出库申请:0 + qw2.eq("bd.state", 1); + qw2.eq("bd.contractNo", contractNo); + List vinListVo = baseMapper.selVinListVo(contractNo, qw2); + record.setVinList(vinListVo); + } + return iPage; + } + public ResultBean getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo(); diff --git a/doc/databases/base_tables.sql b/doc/databases/base_tables.sql index 7dcdfa35be..634fce3c49 100644 --- a/doc/databases/base_tables.sql +++ b/doc/databases/base_tables.sql @@ -993,6 +993,8 @@ CREATE TABLE `base_vehicle_state` `carryInvoiceState` varchar(64) DEFAULT NULL COMMENT '欠款开票状态', `packageBusiness` varchar(64) DEFAULT NULL COMMENT '包牌业务', `contractState` varchar(64) DEFAULT NULL COMMENT '合同状态', + `saleTypeKey` varchar(64) DEFAULT NULL COMMENT '销售类型:1全款,2贷款', + `finSourceKey` varchar(64) DEFAULT NULL COMMENT '款项来源:1自有资金、2三方金融、3担保、4非担保', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB