From 9dbdbf4558907bd47a750da111954f9e9e53b0dc Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 19 Jun 2023 18:02:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=85=8D=E9=80=81=E8=BD=A6=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/entity/BasicDelineNodeEntity.java | 12 +- .../DistributionDeliveryListEntity.java | 10 ++ .../entity/DistributionPackadeliEntity.java | 90 +++++++++++ .../entity/DistributionSigndetailEntity.java | 5 - .../feign/IDistributionPackadeliClient.java | 50 ++++++ .../vo/DistributionDeliveryListVO.java | 8 +- .../vo/DistributionPackadeliVO.java | 97 +++++++++++ .../vo/DistributionstatisticsnmbVO.java | 47 ++++++ .../DistributionDeliveryListController.java | 14 ++ .../DistributionPackadeliController.java | 150 ++++++++++++++++++ .../dto/DistributionDeliveryListDTO.java | 7 +- .../dto/DistributionPackadeliDTO.java | 34 ++++ .../dto/DistributionSigndetailDTO.java | 8 + .../excel/DistributionPackadeliExcel.java | 117 ++++++++++++++ .../feign/DistributionPackadeliClient.java | 53 +++++++ .../DistributionDeliveryListMapper.java | 26 ++- .../mapper/DistributionDeliveryListMapper.xml | 120 ++++++++++++++ .../mapper/DistributionPackadeliMapper.java | 60 +++++++ .../mapper/DistributionPackadeliMapper.xml | 62 ++++++++ .../IDistributionDeliveryListService.java | 12 ++ .../IDistributionPackadeliService.java | 52 ++++++ .../DistributionDeliveryListServiceImpl.java | 43 ++++- .../DistributionPackadeliServiceImpl.java | 54 +++++++ 23 files changed, 1113 insertions(+), 18 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackadeliEntity.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPackadeliClient.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionstatisticsnmbVO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionPackadeliController.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionPackadeliDTO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionPackadeliExcel.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionPackadeliClient.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.xml create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPackadeliService.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackadeliServiceImpl.java diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineNodeEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineNodeEntity.java index 3021d8e0f..f1679c296 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineNodeEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineNodeEntity.java @@ -62,15 +62,15 @@ public class BasicDelineNodeEntity extends TenantEntity { @ApiModelProperty(value = "联系电话") private String telephone; /** - * 预留1 + * 经度 */ - @ApiModelProperty(value = "预留1") - private String reserve1; + @ApiModelProperty(value = "经度") + private String longitude; /** - * 预留2 + * 纬度 */ - @ApiModelProperty(value = "预留2") - private String reserve2; + @ApiModelProperty(value = "纬度") + private String latitude; /** * 预留3 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 53d1b7f38..9afd60813 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -143,5 +143,15 @@ public class DistributionDeliveryListEntity extends TenantEntity { */ @ApiModelProperty(value = "预约表id") private String reservationId; + /** + * 备货时间 + */ + @ApiModelProperty(value = "备货时间") + private String leadTime; + /** + * 装车时间 + */ + @ApiModelProperty(value = "装车时间") + private String loadingTime; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackadeliEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackadeliEntity.java new file mode 100644 index 000000000..ea564c2f6 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackadeliEntity.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 配送包条中间表 实体类 + * + * @author lmy + * @since 2023-06-17 + */ +@Data +@TableName("logpm_distribution_packadeli") +@ApiModel(value = "DistributionPackadeli对象", description = "配送包条中间表") +@EqualsAndHashCode(callSuper = true) +public class DistributionPackadeliEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 配送管理表id + */ + @ApiModelProperty(value = "配送管理表id") + private Long deliveryId; + /** + * 包件表id + */ + @ApiModelProperty(value = "包件表id") + private Long parcelListId; + /** + * 配送状态 + */ + @ApiModelProperty(value = "配送状态") + private String state; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private Integer number; + /** + * 出库数量 + */ + @ApiModelProperty(value = "出库数量") + private Integer outboundNumber; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java index 4cd3104a6..9e894a2c8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java @@ -149,10 +149,5 @@ public class DistributionSigndetailEntity extends TenantEntity { @ApiModelProperty(value = "品牌") private String brand; - /** - * 查询创建时间 - */ - @ApiModelProperty(value = "品牌") - private String createTime_query; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPackadeliClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPackadeliClient.java new file mode 100644 index 000000000..c21ad7911 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPackadeliClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 配送包条中间表 Feign接口类 + * + * @author lmy + * @since 2023-06-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME +) +public interface IDistributionPackadeliClient { + + String API_PREFIX = "packadeli/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取配送包条中间表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java index 15346aa16..cfdaf6113 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java @@ -22,6 +22,8 @@ import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 配送管理 视图实体类 * @@ -33,10 +35,10 @@ import lombok.EqualsAndHashCode; public class DistributionDeliveryListVO extends DistributionDeliveryListEntity { private static final long serialVersionUID = 1L; /** - * 预留4 + * 包条数据 */ - @ApiModelProperty(value = "预留4") - private String reserve4; + @ApiModelProperty(value = "包条数据") + private List packadeList; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java new file mode 100644 index 000000000..d64f6b808 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import io.swagger.annotations.ApiModelProperty; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送包条中间表 视图实体类 + * + * @author lmy + * @since 2023-06-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionPackadeliVO extends DistributionPackadeliEntity { + private static final long serialVersionUID = 1L; + + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String warehouse; + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private Integer conditions; + /** + * 包条码 + */ + @ApiModelProperty(value = "包条码") + private String packetBarCode; + /** + * 货位信息 + */ + @ApiModelProperty(value = "货位信息") + private String goodsAllocation; + /** + * 所在托盘 + */ + @ApiModelProperty(value = "所在托盘") + private String pallet; + /** + * 一级品 + */ + @ApiModelProperty(value = "一级品") + private String firsts; + /** + * 二级品 + */ + @ApiModelProperty(value = "二级品") + private String second; + /** + * 三级品 + */ + @ApiModelProperty(value = "三级品") + private String thirdProduct; + /** + * 物料 + */ + @ApiModelProperty(value = "物料") + private String material; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private Integer quantity; + /** + * 车次号 + */ + @ApiModelProperty(value = "车次号") + private String trainNumber; + /** + * 在库订单ID + */ + @ApiModelProperty(value = "在库订单ID") + private String stockArticleId; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionstatisticsnmbVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionstatisticsnmbVO.java new file mode 100644 index 000000000..831db666d --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionstatisticsnmbVO.java @@ -0,0 +1,47 @@ +package com.logpm.distribution.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 车次统计 + * + * @author lmy + * @since 2023-06-19 + */ +@Data +public class DistributionstatisticsnmbVO { + + /** + * 配送总车数 + */ + @ApiModelProperty(value = "配送总车数") + private Integer vehiclesNub; + + /** + * 配送总件数 + */ + @ApiModelProperty(value = "配送总件数") + private Integer deliveriesTotal; + + /** + * 商配总车次 + */ + @ApiModelProperty(value = "商配总车次") + private Integer commercialNub; + /** + * 商配总件数 + */ + @ApiModelProperty(value = "商配总件数") + private Integer commercialTotal; + /** + * 市配总车数 + */ + @ApiModelProperty(value = "市配总车数") + private Integer marketNub; + /** + * 市配总件数 + */ + @ApiModelProperty(value = "市配总件数") + private Integer marketTotal; +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 4d9839be4..ca1b9a66d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -17,7 +17,9 @@ package com.logpm.distribution.controller; import cn.hutool.core.util.BooleanUtil; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.logpm.distribution.dto.DistributionDeliveryListDTO; +import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -83,6 +85,18 @@ public class DistributionDeliveryListController extends BladeController { return R.data(pages); } + + /** + * 配送管理 配送车次统计 + */ + @GetMapping("/statistics") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + public R statistics(DistributionDeliveryListDTO distributionDeliveryList) { + DistributionstatisticsnmbVO distributionstatisticsnmbVO = distributionDeliveryListService.getNubTotal(distributionDeliveryList); + return R.data(distributionstatisticsnmbVO); + } + /** * 配送管理 自定义分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionPackadeliController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionPackadeliController.java new file mode 100644 index 000000000..c5ce2ce9e --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionPackadeliController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import com.logpm.distribution.vo.DistributionPackadeliVO; +import com.logpm.distribution.excel.DistributionPackadeliExcel; +import com.logpm.distribution.service.IDistributionPackadeliService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 配送包条中间表 控制器 + * + * @author lmy + * @since 2023-06-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("packadeli/distributionPackadeli") +@Api(value = "配送包条中间表", tags = "配送包条中间表接口") +public class DistributionPackadeliController extends BladeController { + + private final IDistributionPackadeliService distributionPackadeliService; + + /** + * 配送包条中间表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distributionPackadeli") + public R detail(DistributionPackadeliEntity distributionPackadeli) { + DistributionPackadeliEntity detail = distributionPackadeliService.getOne(Condition.getQueryWrapper(distributionPackadeli)); + return R.data(detail); + } + /** + * 配送包条中间表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionPackadeli") + public R> list(@ApiIgnore @RequestParam Map distributionPackadeli, Query query) { + IPage pages = distributionPackadeliService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionPackadeli, DistributionPackadeliEntity.class)); + return R.data(pages); + } + + /** + * 配送包条中间表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入distributionPackadeli") + public R> page(DistributionPackadeliVO distributionPackadeli, Query query) { + IPage pages = distributionPackadeliService.selectDistributionPackadeliPage(Condition.getPage(query), distributionPackadeli); + return R.data(pages); + } + + /** + * 配送包条中间表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distributionPackadeli") + public R save(@Valid @RequestBody DistributionPackadeliEntity distributionPackadeli) { + return R.status(distributionPackadeliService.save(distributionPackadeli)); + } + + /** + * 配送包条中间表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionPackadeli") + public R update(@Valid @RequestBody DistributionPackadeliEntity distributionPackadeli) { + return R.status(distributionPackadeliService.updateById(distributionPackadeli)); + } + + /** + * 配送包条中间表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入distributionPackadeli") + public R submit(@Valid @RequestBody DistributionPackadeliEntity distributionPackadeli) { + return R.status(distributionPackadeliService.saveOrUpdate(distributionPackadeli)); + } + + /** + * 配送包条中间表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(distributionPackadeliService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-distributionPackadeli") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入distributionPackadeli") + public void exportDistributionPackadeli(@ApiIgnore @RequestParam Map distributionPackadeli, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionPackadeli, DistributionPackadeliEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DistributionPackadeli::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(DistributionPackadeliEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = distributionPackadeliService.exportDistributionPackadeli(queryWrapper); + ExcelUtil.export(response, "配送包条中间表数据" + DateUtil.time(), "配送包条中间表数据表", list, DistributionPackadeliExcel.class); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java index 66a5ae247..8dee5a04e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.dto; import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,5 +31,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionDeliveryListDTO extends DistributionDeliveryListEntity { private static final long serialVersionUID = 1L; - + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "查询创建时间") + private String createTime_query; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionPackadeliDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionPackadeliDTO.java new file mode 100644 index 000000000..f31238c6c --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionPackadeliDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送包条中间表 数据传输对象实体类 + * + * @author lmy + * @since 2023-06-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionPackadeliDTO extends DistributionPackadeliEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java index 0375fafcc..93a15c093 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java @@ -69,4 +69,12 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date sjsigningTime; + + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "查询创建时间") + private String createTime_query; + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionPackadeliExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionPackadeliExcel.java new file mode 100644 index 000000000..dc2472c7e --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionPackadeliExcel.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 配送包条中间表 Excel实体类 + * + * @author lmy + * @since 2023-06-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionPackadeliExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 配送管理表id + */ + @ColumnWidth(20) + @ExcelProperty("配送管理表id") + private Long deliveryId; + /** + * 包件表id + */ + @ColumnWidth(20) + @ExcelProperty("包件表id") + private Long parcelListId; + /** + * 配送状态 + */ + @ColumnWidth(20) + @ExcelProperty("配送状态") + private String state; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Integer number; + /** + * 出库数量 + */ + @ColumnWidth(20) + @ExcelProperty("出库数量") + private Integer outboundNumber; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionPackadeliClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionPackadeliClient.java new file mode 100644 index 000000000..8a31f6481 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionPackadeliClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import com.logpm.distribution.service.IDistributionPackadeliService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 配送包条中间表 Feign实现类 + * + * @author lmy + * @since 2023-06-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class DistributionPackadeliClient implements IDistributionPackadeliClient { + + private final IDistributionPackadeliService distributionPackadeliService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = distributionPackadeliService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 297b21720..7ab71f2c2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; @@ -50,5 +51,28 @@ public interface DistributionDeliveryListMapper extends BaseMapper exportDistributionDeliveryList(@Param("ew") Wrapper queryWrapper); - + /** + * 商配车次 + * + * @return + */ + Integer selectBycommercialNub(@Param("param") DistributionDeliveryListDTO distributionDeliveryList); + /** + * 商配件数 + * + * @return + */ + Integer selectcommercialTotal(@Param("param") DistributionDeliveryListDTO distributionDeliveryList); + /** + * 市配车次 + * + * @return + */ + Integer selectmarketNub(@Param("param") DistributionDeliveryListDTO distributionDeliveryList); + /** + * 市配件数 + * + * @return + */ + Integer selectmarketTotal(DistributionDeliveryListDTO distributionDeliveryList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index aea9b9e18..b4ee0158f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -45,5 +45,125 @@ + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.java new file mode 100644 index 000000000..44dd8bb4f --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.mapper; + +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import com.logpm.distribution.vo.DistributionPackadeliVO; +import com.logpm.distribution.excel.DistributionPackadeliExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 配送包条中间表 Mapper 接口 + * + * @author lmy + * @since 2023-06-17 + */ +public interface DistributionPackadeliMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param distributionPackadeli + * @return + */ + List selectDistributionPackadeliPage(IPage page, DistributionPackadeliVO distributionPackadeli); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionPackadeli(@Param("ew") Wrapper queryWrapper); + /** + * 通过配送id查询包条数据 + * + * @param id + * @return DistributionPackadeliVO + */ + List selectjointList(Long id); +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.xml new file mode 100644 index 000000000..2f5cd761a --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackadeliMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 36228f254..36a6cfce3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -17,11 +17,14 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import org.springblade.core.mp.base.BaseService; + import java.util.List; /** @@ -48,6 +51,7 @@ public interface IDistributionDeliveryListService extends BaseService exportDistributionDeliveryList(Wrapper queryWrapper); + /** * 获取其他表信息 * @@ -55,4 +59,12 @@ public interface IDistributionDeliveryListService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param distributionPackadeli + * @return + */ + IPage selectDistributionPackadeliPage(IPage page, DistributionPackadeliVO distributionPackadeli); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionPackadeli(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index ef93cc809..764e871e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -16,16 +16,25 @@ */ package com.logpm.distribution.service.impl; +import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import com.logpm.distribution.mapper.DistributionPackadeliMapper; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.logpm.distribution.mapper.DistributionDeliveryListMapper; import com.logpm.distribution.service.IDistributionDeliveryListService; +import com.logpm.distribution.vo.DistributionPackadeliVO; +import com.logpm.distribution.vo.DistributionstatisticsnmbVO; +import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; + +import java.math.BigInteger; +import java.text.SimpleDateFormat; import java.util.List; /** @@ -35,8 +44,9 @@ import java.util.List; * @since 2023-06-16 */ @Service +@AllArgsConstructor public class DistributionDeliveryListServiceImpl extends BaseServiceImpl implements IDistributionDeliveryListService { - + private final DistributionPackadeliMapper distributionPackadeliMapper; @Override public IPage selectDistributionDeliveryListPage(IPage page, DistributionDeliveryListVO distributionDeliveryList) { return page.setRecords(baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList)); @@ -57,8 +67,37 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl list = distributionPackadeliMapper.selectjointList(detail.getId()); + distributionDeliveryListVO.setPackadeList(list); + return distributionDeliveryListVO; + } - return null; + @Override + public DistributionstatisticsnmbVO getNubTotal(DistributionDeliveryListDTO distributionDeliveryList) { + //转换创建时间 + if (null != distributionDeliveryList.getCreateTime()){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + distributionDeliveryList.setCreateTime_query(sdf.format(distributionDeliveryList.getCreateTime())); + } + DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO(); + //商配车次 + Integer commercialNub = baseMapper.selectBycommercialNub(distributionDeliveryList); + //商配件数 + Integer commercialTotal = baseMapper.selectcommercialTotal(distributionDeliveryList); + //市配车次 + Integer marketNub = baseMapper.selectmarketNub(distributionDeliveryList); + //市配件数 + Integer marketTotal = baseMapper.selectmarketTotal(distributionDeliveryList); + //配送总车次 + distributionstatisticsnmbVO.setVehiclesNub(commercialNub+marketNub); + //配送总件数 + distributionstatisticsnmbVO.setDeliveriesTotal(commercialTotal+marketTotal); + distributionstatisticsnmbVO.setCommercialNub(commercialNub); + distributionstatisticsnmbVO.setCommercialTotal(commercialTotal); + distributionstatisticsnmbVO.setMarketNub(marketNub); + distributionstatisticsnmbVO.setMarketTotal(marketTotal); + return distributionstatisticsnmbVO; } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackadeliServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackadeliServiceImpl.java new file mode 100644 index 000000000..2677a5f38 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackadeliServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service.impl; + +import com.logpm.distribution.entity.DistributionPackadeliEntity; +import com.logpm.distribution.vo.DistributionPackadeliVO; +import com.logpm.distribution.excel.DistributionPackadeliExcel; +import com.logpm.distribution.mapper.DistributionPackadeliMapper; +import com.logpm.distribution.service.IDistributionPackadeliService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 配送包条中间表 服务实现类 + * + * @author lmy + * @since 2023-06-17 + */ +@Service +public class DistributionPackadeliServiceImpl extends BaseServiceImpl implements IDistributionPackadeliService { + + @Override + public IPage selectDistributionPackadeliPage(IPage page, DistributionPackadeliVO distributionPackadeli) { + return page.setRecords(baseMapper.selectDistributionPackadeliPage(page, distributionPackadeli)); + } + + + @Override + public List exportDistributionPackadeli(Wrapper queryWrapper) { + List distributionPackadeliList = baseMapper.exportDistributionPackadeli(queryWrapper); + //distributionPackadeliList.forEach(distributionPackadeli -> { + // distributionPackadeli.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionPackadeli.getType())); + //}); + return distributionPackadeliList; + } + +}