diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 4826d53a1..bbc3dad1c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -93,6 +93,9 @@ public class OldSystemDataPushConfig { //茂名仓 warehourseIds.add("152"); + + //兴义仓 + warehourseIds.add("155"); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 3aa2fc6a5..401985485 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -221,4 +221,22 @@ public class BasicdataDriverArteryEntity extends TenantEntity { @ApiModelProperty(value = "仓库名称") private String warehouseName; + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金") + private Integer settlementChannel ; + + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算账号") + private String settlementAccount ; + + /** + * 合同 + */ + @ApiModelProperty(value = "合同") + private String contract; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehicleDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehicleDTO.java index b44dc7833..43637802c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehicleDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehicleDTO.java @@ -32,7 +32,11 @@ import lombok.EqualsAndHashCode; public class BasicdataVehicleDTO extends BasicdataVehicleEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "车辆所属") private String vehicleOwners; + /** + * 页面类型 0-全部 1-保险临期 2-保险到期 3-年审临期 4-年审到期 + */ + private Integer pageType; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index bfddef518..ee1dc329c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java @@ -70,4 +70,37 @@ public interface BasicdataVehicleMapper extends BaseMapper selectInsuranceDeadlineBasicdataVehiclePage(IPage page,@Param("param") BasicdataVehicleDTO basicdataVehicle); + + /** + * 保险到期 + * @param page + * @param basicdataVehicle + * @return + */ + IPage selectInsuranceExpireBasicdataVehiclePage(IPage page,@Param("param") BasicdataVehicleDTO basicdataVehicle); + + /** + * 年审临期 + * @param page + * @param basicdataVehicle + * @return + */ + IPage selectAnnualDeadlineBasicdataVehiclePage(IPage page,@Param("param") BasicdataVehicleDTO basicdataVehicle); + + /** + * 年审到期 + * @param page + * @param basicdataVehicle + * @return + */ + IPage selectAnnualExpireBasicdataVehiclePage(IPage page,@Param("param") BasicdataVehicleDTO basicdataVehicle); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index 1d2a62b95..81d8c2815 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -331,6 +331,357 @@ lbv.id = #{id} AND is_deleted = 0 + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index 0607d55f8..6605a31a0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java @@ -42,6 +42,7 @@ import com.logpm.basicdata.vo.BasicdataCarrierVO; import com.logpm.basicdata.vo.BasicdataVehicleVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.PhoneCheckUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -51,10 +52,7 @@ import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -75,14 +73,42 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl selectBasicdataVehiclePage(IPage page, BasicdataVehicleDTO basicdataVehicle) { - return page.setRecords(baseMapper.selectBasicdataVehiclePage(page, basicdataVehicle)); + if (Objects.isNull(basicdataVehicle.getPageType())) { + throw new CustomerException("pageType参数缺失!!!"); + } + switch (basicdataVehicle.getPageType()) { + case 0: + //全部 + List basicdataVehicleVOS = baseMapper.selectBasicdataVehiclePage(page, basicdataVehicle); + return page.setRecords(basicdataVehicleVOS); + case 1: + //保险临期 + IPage insuranceDeadlineBasicdataVehicleVOS = baseMapper.selectInsuranceDeadlineBasicdataVehiclePage(page, basicdataVehicle); + return insuranceDeadlineBasicdataVehicleVOS; + case 2: + //保险到期 + IPage insuranceExpireBasicdataVehicleVOS = baseMapper.selectInsuranceExpireBasicdataVehiclePage(page, basicdataVehicle); + return insuranceExpireBasicdataVehicleVOS; + case 3: + //年审临期 + IPage annualDeadlineBasicdataVehicleVOS = baseMapper.selectAnnualDeadlineBasicdataVehiclePage(page, basicdataVehicle); + return annualDeadlineBasicdataVehicleVOS; + case 4: + //年审到期 + IPage expireDeadlineBasicdataVehicleVOS = baseMapper.selectAnnualExpireBasicdataVehiclePage(page, basicdataVehicle); + return expireDeadlineBasicdataVehicleVOS; + default: + log.error("未知的车辆类型>>>>>>>>>>>>>"); + return null; + } } @Override - public List exportBasicdataVehicle(String ids) { + public List exportBasicdataVehicle(String ids) { List basicdataVehicleList = baseMapper.exportBasicdataVehicle(ids.isEmpty() ? null : Func.toLongList(ids)); // List basicdataCarrierVOS = basicdataCarrierService.selectBasicdataCarrierDictionary(); @@ -106,7 +132,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl selectBasicdataVehicleDictionary(String vehicleNub) { - if(StringUtil.isBlank(vehicleNub)){ + if (StringUtil.isBlank(vehicleNub)) { vehicleNub = null; } return baseMapper.selectBasicdataDictionary(vehicleNub); @@ -116,30 +142,30 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl().lambda().eq(BasicdataDrivermiddleEntity::getBrandId, basicdataVehicle.getId())); - if (basicdataVehicle.getVehicleOwners().isEmpty()){ + if (basicdataVehicle.getVehicleOwners().isEmpty()) { return delete; } //新增现有的数据 - // if (delete>0){ - List bindOwners = Arrays.asList(basicdataVehicle.getVehicleOwners().split(",")); - ArrayList basicdataDrivermiddleEntities = new ArrayList<>(); - bindOwners.forEach(e->{ - BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity(); - basicdataDrivermiddleEntity.setBrandId(basicdataVehicle.getId()); - basicdataDrivermiddleEntity.setDriverId(Long.valueOf(e)); - basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity); - }); - - basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities); - // } + // if (delete>0){ + List bindOwners = Arrays.asList(basicdataVehicle.getVehicleOwners().split(",")); + ArrayList basicdataDrivermiddleEntities = new ArrayList<>(); + bindOwners.forEach(e -> { + BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity(); + basicdataDrivermiddleEntity.setBrandId(basicdataVehicle.getId()); + basicdataDrivermiddleEntity.setDriverId(Long.valueOf(e)); + basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity); + }); + + basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities); + // } return delete; } @Override public boolean saveVehicle(BasicdataVehicleDTO basicdataVehicle) { - if (Func.isNotEmpty(basicdataVehicle.getCarrierId())){ + if (Func.isNotEmpty(basicdataVehicle.getCarrierId())) { BasicdataCarrierEntity carrierEntity = basicdataCarrierService.getById(basicdataVehicle.getCarrierId()); - if (Func.isNotEmpty(carrierEntity)){ + if (Func.isNotEmpty(carrierEntity)) { basicdataVehicle.setCarrierName(carrierEntity.getCarrierName()); } @@ -152,7 +178,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl list = this.list(); List basicdataVehicleVOS = new ArrayList<>(); - if(Func.isEmpty(list)){ + if (Func.isEmpty(list)) { return null; } // 查询所有的iD @@ -168,22 +194,22 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl basicdataDriverArteryEntities1 = basicdataDriverArteryMapper.selectList(queryWrapper1); - if (Func.isNotEmpty(list)){ - list.forEach(l->{ + if (Func.isNotEmpty(list)) { + list.forEach(l -> { BasicdataVehicleVO vehicleVO = Func.copy(l, BasicdataVehicleVO.class); List basicdataDrivermiddleEntities = groupedEntities.get(vehicleVO.getId()); - if(Func.isNotEmpty(basicdataDrivermiddleEntities)){ + if (Func.isNotEmpty(basicdataDrivermiddleEntities)) { List driverIds = basicdataDrivermiddleEntities. stream().filter(f -> Func.isNotEmpty(f.getDriverId())).map(BasicdataDrivermiddleEntity::getDriverId).collect(Collectors.toList()); - if (Func.isNotEmpty(driverIds)){ + if (Func.isNotEmpty(driverIds)) { List basicdataDriverArteryEntities = new ArrayList(); for (Long driverId : driverIds) { - basicdataDriverArteryEntities1.forEach(e->{ - if (driverId.equals(e.getId())){ + basicdataDriverArteryEntities1.forEach(e -> { + if (driverId.equals(e.getId())) { basicdataDriverArteryEntities.add(e); } }); @@ -210,56 +236,56 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl data) { String method = "#############BasicdataVehicleServiceImpl.importDriverArtery"; - log.info("车辆模板导入信息>>>>{}",data); + log.info("车辆模板导入信息>>>>{}", data); try { - ListdrivermiddleEntities = new ArrayList<>(); + List drivermiddleEntities = new ArrayList<>(); //对导入数据进行处理 for (BasicdataVehicleImportExcel datum : data) { BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = null; BasicdataVehicleEntity entity = this.getOne(Wrappers.query().lambda().eq(BasicdataVehicleEntity::getVehicleNub, datum.getVehicleNub())); - if (Func.isNotEmpty(entity)){ + if (Func.isNotEmpty(entity)) { continue; } //查询模板信息是否合法 //车牌号是否合法 - if (Func.isEmpty(datum.getVehicleNub())){ + if (Func.isEmpty(datum.getVehicleNub())) { //车牌号为空 throw new ServiceException("请填写车牌号！"); } //查看是否填写了电话号码，如果填写了电话号码进行校验号码是否有效 - if (Func.isNotEmpty(datum.getVehicleUnitPhone())){ + if (Func.isNotEmpty(datum.getVehicleUnitPhone())) { //车辆所属单位电话校验 boolean a = PhoneCheckUtil.checkPhone(datum.getVehicleUnitPhone()); - if (a){ + if (a) { throw new ServiceException("请填写正确手机号码！"); - } + } } - if (Func.isNotEmpty(datum.getVehicleOwnerPhone())){ + if (Func.isNotEmpty(datum.getVehicleOwnerPhone())) { //车辆所属人电话校验 - boolean b = PhoneCheckUtil.checkPhone(datum.getVehicleOwnerPhone()); - if (b){ + boolean b = PhoneCheckUtil.checkPhone(datum.getVehicleOwnerPhone()); + if (b) { throw new ServiceException("请填写正确手机号码！"); } - //进行关系司机绑定 + //进行关系司机绑定 //查询是否存在司机 - if (!StringUtil.isBlank(datum.getVehicleOwner())){ - BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryMapper.findDriverListByPhone(datum.getVehicleOwner().trim(),datum.getVehicleOwnerPhone().trim()); + if (!StringUtil.isBlank(datum.getVehicleOwner())) { + BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryMapper.findDriverListByPhone(datum.getVehicleOwner().trim(), datum.getVehicleOwnerPhone().trim()); if (BeanUtil.isEmpty(driverArteryEntity)) { - log.info(method+ "查询到司机信息，进行绑定！>>>:{}",driverArteryEntity.getName()); - log.info(method+ "查询到司机信息，进行绑定！>>>:{}",driverArteryEntity.getPhone()); + log.info(method + "查询到司机信息，进行绑定！>>>:{}", driverArteryEntity.getName()); + log.info(method + "查询到司机信息，进行绑定！>>>:{}", driverArteryEntity.getPhone()); //绑定用户 basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity(); basicdataDrivermiddleEntity.setDriverId(driverArteryEntity.getId()); - } + } } } - if (Func.isNotEmpty(datum.getCarrierName())){ + if (Func.isNotEmpty(datum.getCarrierName())) { //存在承运商,进行承运商的校验 //找到数据库内的承运商 List basicdataCarrierEntities = basicdataCarrierService.list(Wrappers.lambdaQuery().eq(BasicdataCarrierEntity::getCarrierName, datum.getCarrierName())); @@ -279,16 +305,16 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl - and ldpll.order_code like concat(#{par.orderCode},'%') + and ldpll.order_code like concat('%',#{par.orderCode},'%') GROUP BY ldpll.stock_article_id HAVING SUM(ldpll.quantity) > 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 835d07ea8..a444b41dd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -28,8 +28,10 @@ import com.google.zxing.WriterException; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; import com.logpm.basicdata.entity.BasicdataClientEntity; +import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataClientClient; +import com.logpm.basicdata.feign.IBasicdataGoodsAllocationClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; @@ -60,14 +62,14 @@ import com.logpm.distribution.vo.PackageStockupVO; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; +import com.logpm.warehouse.entity.WarehouseConfigEntity; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; import com.logpm.warehouse.entity.WarehouseWaybillEntity; -import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; -import com.logpm.warehouse.feign.IWarehouseWaybillClient; +import com.logpm.warehouse.feign.*; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.WorkNodeEnums; +import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.order.OrderStockupStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; @@ -126,6 +128,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId()); + BasicdataGoodsAllocationEntity defaultGoodsAllocation; + Integer isAutoWarehouse; + if (!Objects.isNull(warehouseConfig)){ + if (!Objects.isNull(warehouseConfig.getIsAutoWarehouse())){ + //查询备货库位 + isAutoWarehouse = warehouseConfig.getIsAutoWarehouse() != null ? warehouseConfig.getIsAutoWarehouse() : 0; + if (isAutoWarehouse == Integer.parseInt(IsOrNoConstant.yes.getValue())){ + defaultGoodsAllocation = allocationClient.findDefaultGoodsAllocation(myCurrentWarehouse.getId()); + } else { + defaultGoodsAllocation = null; + } + } else { + defaultGoodsAllocation = null; + isAutoWarehouse = 0; + } + } else { + defaultGoodsAllocation = null; + isAutoWarehouse = 0; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); String s = String.valueOf(o); if (s.contains(",")) { String[] split = s.split(","); @@ -541,33 +571,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl packageIds = new ArrayList<>(); v.forEach(i -> { - //查询有没有打托数据 - -// //查询包件有没有物料 -// List list = distributionParcelDetailsService.list(Wrappers.query().lambda() -// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) -// ); -// if (!list.isEmpty()) { -// //有 -// list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) -// .forEach((kk, vv) -> { -// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); -// BeanUtil.copyProperties(vv.get(0), parcelListEntity); -// parcelListEntity.setQuantity(sum); -// parcelListEntity.setMaterialName(vv.get(0).getName()); -// parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); -// parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); -// // 添加库存品信息 -// //查询在库订单信息 -// DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId()); -// if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { -// throw new ServiceException("订单的客户数据异常，无法转换！！"); -// } -// addStockList(distributionStockArticleEntity, parcelListEntity, 1); -// }); -// } - - DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); BeanUtil.copyProperties(i, parcelListEntity); @@ -594,6 +597,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl parcelListEntities = this.list(Wrappers.query().lambda() -// .eq(DistributionParcelListEntity::getStockArticleId, oo) -// .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) -// ); -// int sum = parcelListEntities.stream().filter(p -> "1".equals(p.getConditions())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); -// distributionStockArticleEntity.setHandQuantity(sum); -// distributionStockArticleEntity.setIncomingNum(sum); - distributionStockArticleMapper.updateById(distributionStockArticleEntity); } }); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 3fbf5a176..2fa39c457 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -3948,11 +3948,18 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl pages = reportDeliverService.detailsPage(vo, query); return R.data(pages); } + @GetMapping("/details/v2") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "配送明细报表v2", notes = "配送明细报表v2") + public R> detailsPageV2(ReportDetailVO vo, DevilerDetailsQuery query) { + IPage pages = reportDeliverService.detailsPageV2(vo, query); + return R.data(pages); + } @GetMapping("/exportDetails") @ApiOperationSupport(order = 6) @@ -97,6 +104,13 @@ public class ReportDeliveryController extends BladeController { public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { reportDeliverService.exportDetails(response, vo, query); + } + @GetMapping("/exportDetails/v2") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "导出配送明细报表v2", notes = "导出配送明细报表v2") + public void exportDetailsV2(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { + reportDeliverService.exportDetailsV2(response, vo, query); + } @GetMapping("/stockOrder") diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index bd6a6bacc..7795250d3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -70,6 +70,9 @@ public interface ReportDeliverMapeer extends BaseMapper { List getDeliveryTrainLoadSacnInvnByIds(@Param("idBatch") List idBatch); Long getDetailsPageCount(@Param("ew") Wrapper query); + Long getDetailsV2PageCount(@Param("ew") Wrapper query); List getDetailsPageExport(@Param("ew") Wrapper queryWrapper, @Param("current") Integer current, @Param("size") Integer size); + + List getDetailsPageV2(IPage page, @Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index e4d158a4a..5ad020432 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -500,6 +500,67 @@ + + + select * + from (select plan_train_number train_number, + plan_reservation_code reservation_code, + delivery_time task_time, + warehouse_name warehouse_name, + warehouse_id warehouse_id, + delivery_type type, + delivery_kind kind, + vehicle_name vehicle_name, + driver_name driver_name, + distribution_company distribution_company, + custom_name dr_consignee, + custom_phone delivery_phone, + custom_address delivery_address, + consignee_unit consignee, + consignee_person consignee_name, + consignee_mobile consignee_mobile, + waybill_number waybill_no, + order_code stock_article_id, + order_package_code order_package_code, + train_number customer_train, + case + when conditions = 1 then '订制品' + when conditions = 2 then '零担' + when conditions = 3 then '库存品' end conditions, + firsts_product firsts, + second_product decond, + third_product third_product, + materiel_code material_code, + materiel_name material_name, + begin_warehouse_name start_war, + begin_warehouse_in_time start_war_in_time, + begin_warehouse_out_time start_war_out_time, + end_warehouse_in_time warehouse_entry_time_end, + case + when sign_status = 1 then '已签收' + when sign_status = 0 then '未签收' + when sign_status = -1 then '已回库' end driver_signing, + load_time unload_time, + load_user_name un_administrators_name, + sign_time sjsigning_time, + sign_user_name lds_signee_name, + case when review_time is null then '未复核' else '已复核' end signing_status, + review_time signing_time, + sign_num sign_num, + sign_type sign_type, + load_type loading_mode, + brand_name brand, + review_user_name examine_user_name, + case + when plan_reservation_code = sign_reservation_code then '否' + when plan_reservation_code != sign_reservation_code then '是' + else '' end abnormal_signing + from logpm_quality_deliver + order by id desc + ) t ${ew.customSqlSegment} + select id, @@ -837,6 +898,11 @@ ) t +