From 7047fdbadb48b11642006f35f66bc5702baffd0d Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 8 Nov 2023 16:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tributionReservationPackageController.java | 8 +- ...tionReservationStockarticleController.java | 8 +- ...ibutionReservationStocklistController.java | 8 +- .../DistributionReservationPackageDTO.java | 2 +- .../DistributionReservationPackageExcel.java | 139 ++++++++++++++---- ...tributionReservationStockarticleExcel.java | 90 ++++++++---- .../mapper/DistributionReservationMapper.xml | 2 +- .../DistributionReservationPackageMapper.java | 2 +- .../DistributionReservationPackageMapper.xml | 29 +++- ...tributionReservationStockarticleMapper.xml | 27 +++- ...istributionReservationStocklistMapper.java | 3 +- ...DistributionReservationStocklistMapper.xml | 9 +- .../mapper/DistributionSigndetailMapper.xml | 3 + ...DistributionReservationPackageService.java | 5 +- ...ibutionReservationStockarticleService.java | 5 +- ...stributionReservationStocklistService.java | 5 +- .../DistributionDeliveryListServiceImpl.java | 1 + ...ributionReservationPackageServiceImpl.java | 31 +++- ...ionReservationStockarticleServiceImpl.java | 19 ++- ...butionReservationStocklistServiceImpl.java | 22 ++- .../DistributionSigndetailServiceImpl.java | 8 +- .../impl/DistributionStockupServiceImpl.java | 15 +- 22 files changed, 330 insertions(+), 111 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java index f8fa8f3d5..6203ea4b1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java @@ -138,12 +138,8 @@ public class DistributionReservationPackageController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationPackage") public void exportDistributionReservationPackage(@ApiIgnore @RequestParam Map distributionReservationPackage, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationPackage::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationPackageService.exportDistributionReservationPackage(queryWrapper); + + List list = distributionReservationPackageService.exportDistributionReservationPackage(distributionReservationPackage); ExcelUtil.export(response, "预约包件中间表数据" + DateUtil.time(), "预约包件中间表数据表", list, DistributionReservationPackageExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java index 7bf8de2d1..33a267d71 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java @@ -149,12 +149,8 @@ public class DistributionReservationStockarticleController extends BladeControll @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationStockarticle") public void exportDistributionReservationStockarticle(@ApiIgnore @RequestParam Map distributionReservationStockarticle, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationStockarticle::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(queryWrapper); + + List list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(distributionReservationStockarticle); ExcelUtil.export(response, "预约订单中间表数据" + DateUtil.time(), "预约订单中间表数据表", list, DistributionReservationStockarticleExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java index d5ad4f371..da738f005 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java @@ -138,12 +138,8 @@ public class DistributionReservationStocklistController extends BladeController @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationStocklist") public void exportDistributionReservationStocklist(@ApiIgnore @RequestParam Map distributionReservationStocklist, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationStocklist::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationStocklistService.exportDistributionReservationStocklist(queryWrapper); + + List list = distributionReservationStocklistService.exportDistributionReservationStocklist(distributionReservationStocklist); ExcelUtil.export(response, "预约库存中间表数据" + DateUtil.time(), "预约库存中间表数据表", list, DistributionReservationStocklistExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java index 5e5dd0359..0d4e39bcb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java @@ -30,5 +30,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity { private static final long serialVersionUID = 1L; - + private Long warehouseId; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java index 0c7fbfecd..9173bcf28 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java @@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -40,65 +41,145 @@ public class DistributionReservationPackageExcel implements Serializable { private static final long serialVersionUID = 1L; + /** - * 租户号 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("预约编号") + private String reservationCode; /** - * 是否已删除 + * 包件编号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("预约时间") + private Date reservation_date; + /** - * 预约编号 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预约编号") - private String reservationId; + @ExcelProperty("服务类型") + private String deliveryType; /** - * 包件编号 + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货人") + private String consignee; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("手机号码") + private String deliveryPhone; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货地址") + private String deliveryAddress; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + /** + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("包件编号") - private String parceListId; + @ExcelProperty("服务号") + private String serviceNumber; /** - * 预留1 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; + @ExcelProperty("订单自编号") + private String orderCode; /** - * 预留2 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("仓库") + private String warehouseName; /** - * 预留3 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; + @ExcelProperty("包条码") + private String orderPackageCode; /** - * 预留4 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("发站仓") + private String sendWarehouseName; /** - * 预留5 + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("目的仓") + private String acceptWarehouseName; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("入库时间") + private String warehouseEntryTimeEnd; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("车次号") + private String trainNumber; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("一级品") + private Long firsts; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("二级品") + private Long second; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("三级品") + private Long thirdProduct; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("物料名称") + private Long materialName; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long quantity; +// /** +// * 订单编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("计划数量") +// private Long stockArticle; + /** + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("货位数量") + private Long positionCode; /** * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("订单编号") - private Long stockArticle; + @ExcelProperty("所在托盘") + private Long trayCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java index c9a245fc3..c7b74d1b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java @@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -40,65 +41,100 @@ public class DistributionReservationStockarticleExcel implements Serializable { private static final long serialVersionUID = 1L; + + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("预约单号") + private String reservationCode; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("商场名称") + private String mallName; + /** - * 租户号 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("门店名称") + private String storeName; /** - * 是否已删除 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("货物名称") + private String descriptionGoods; /** * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("预约编号") - private String reservationId; + @ExcelProperty("品牌") + private String brand; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货单位") + private String consigneeUnit; /** * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("订单编号") - private String stockarticleId; + @ExcelProperty("订单来源") + private String resource; + /** * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预约数量") - private String reservationNum; + @ExcelProperty("服务类型") + private String deliveryType; /** - * 预留1 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; + @ExcelProperty("预约时间 ") + private Date reservationDate; /** - * 预留2 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("收货人") + private String consignee; /** - * 预留3 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; + @ExcelProperty("手机号") + private String deliveryPhone; /** - * 预留4 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("收货地址") + private String deliveryAddress; /** - * 预留5 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("包件数量") + private String reservationNum; + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 6a0eeac94..5c2c9cc31 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -927,7 +927,7 @@ - + + select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress + ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName, + ldpl.waybill_number waybillNumber,ldpl.service_number serviceNumber,ldpl.order_code orderCode,ldpl.order_package_code orderPackageCode,ldpl.send_warehouse_name sendWarehouseName + ,ldpl.accept_warehouse_name acceptWarehouseName,ldpl.warehouse_entry_time_end warehouseEntryTimeEnd, + ldpl.train_number trainNumber,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,ldpl.quantity, lwtg.tray_code trayCode, + lwug.position_code positionCode + + from logpm_distribution_reservation_package ldrp + LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.warehouse_id = #{param.warehouseId} + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.warehouse_id = #{param.warehouseId} + + ldrp.packet_bar_status in (1,3) + and ldrs.reservation_id = #{param.reservationId } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + + - + + + select ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress + ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum, + ldsa.waybill_number waybillNumber,ldsa.order_code orderCode,ldsa.mall_name mallName,ldsa.store_name storeName,ldsa.description_goods descriptionGoods,ldsa.brand, + ldsa.consignee_unit consigneeUnit ,ldsa.resource + from logpm_distribution_reservation ldr + LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id + LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id + + ldrs.stock_article_status in (1,3) + and ldrs.reservation_id = #{param.reservationId } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + and = #{param. } + + + - SELECT * FROM logpm_distribution_reservation_stocklist ${ew.customSqlSegment} + + + + + + + +