From 2362d03e19fac3bebc152bf9b8937cec2646a59e Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 18 Oct 2023 23:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=A2=84=E7=BA=A6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E3=80=81=E5=8C=85=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4;=20=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95=20=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9B=98=E7=82=B9=E5=95=86=E5=9C=BA=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DistributionReservationOrderPackageVO.java | 61 +++ .../feign/IInventoryDetailClient.java | 1 + .../DistributionDeliveryListController.java | 22 + .../DistributionReservationController.java | 19 +- .../DistributionStockArticleController.java | 13 + .../DistributionDeliveryListMapper.java | 8 + .../mapper/DistributionDeliveryListMapper.xml | 23 + .../mapper/DistributionReservationMapper.xml | 3 +- .../IDistributionDeliveryInfoService.java | 3 + .../IDistributionDeliveryListService.java | 17 + .../IDistributionReservationService.java | 8 + .../IDistributionStockArticleService.java | 4 + .../DistributionDeliveryInfoServiceImpl.java | 3 + .../DistributionDeliveryListServiceImpl.java | 311 ++++++++++--- .../DistributionReservationServiceImpl.java | 418 +++++++++++------- .../DistributionStockArticleServiceImpl.java | 15 +- .../service/impl/TaskQuestServiceImpl.java | 8 +- 17 files changed, 722 insertions(+), 215 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationOrderPackageVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationOrderPackageVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationOrderPackageVO.java new file mode 100644 index 000000000..10b93f804 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationOrderPackageVO.java @@ -0,0 +1,61 @@ +/* + * 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.DistributionStockArticleEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 配送在库订单 视图实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +public class DistributionReservationOrderPackageVO { + private static final long serialVersionUID = 1L; + + + /** + * 使用包件信息 + */ + @ApiModelProperty(value = "包件信息") + private String packageListIds; + + /** + * 使用包件信息 + */ + @ApiModelProperty(value = "包件信息") + private List packageList; + + /** + * 使用包件信息 + */ + @ApiModelProperty(value = "包件信息") + private List reservationPackageList; + + + + +} diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IInventoryDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IInventoryDetailClient.java index d1449bd42..ca0e5f844 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IInventoryDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IInventoryDetailClient.java @@ -4,6 +4,7 @@ import com.logpm.oldproject.entity.InventoryDetailEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; @FeignClient( value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME 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 ea5bbdc05..5a7b18122 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 @@ -116,6 +116,17 @@ public class DistributionDeliveryListController extends BladeController { } + /** + * 查看订单 + */ + @GetMapping("/getPackageListByDeliveryIdAndOrderId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList") + public R getPackageListByDeliveryIdAndOrderId(@RequestParam Long deliveryId,@RequestParam Long orderId, Query query) { + R r = distributionDeliveryListService.getPackageListByDeliveryIdAndOrderId(Condition.getPage(query), deliveryId,orderId); + return R.data(r); + } + /** * 查看订单 */ @@ -321,6 +332,17 @@ public class DistributionDeliveryListController extends BladeController { return R.data(distributionStockArticle); } + /** + * 查询配送计划下零担信息 + */ + @GetMapping("/getDeliveryZeroOrderDetail") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "customArgs") + public R> getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) { + List parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); + return R.data(parcelNumberVOS); + } + /** * 修改市配配送计划 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index d539ac05b..837dae2b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -26,9 +26,7 @@ import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.service.IDistributionReservationService; -import com.logpm.distribution.vo.DistributionParcelNumberVO; -import com.logpm.distribution.vo.DistributionReservationVO; -import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.DistributionReservationWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -345,5 +343,20 @@ public class DistributionReservationController extends BladeController { } + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationPackageListByOrderId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationPackageListByorderId(@ApiIgnore @RequestParam Long orderId, @ApiIgnore @RequestParam Long reservationId, Query query) { + R parcelListVOIPage = reservationService.getReservationPackageListByOrderId(orderId,reservationId,Condition.getPage(query)); + return R.data(parcelListVOIPage); + } + + + + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 94745fbad..eacc36aff 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -28,6 +28,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.excel.DistributionStockArticleImporter; import com.logpm.distribution.service.IDistributionStockArticleService; +import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelNumberVO; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; @@ -132,6 +133,18 @@ public class DistributionStockArticleController extends BladeController { return R.data(pages); } + /** + * 配送在库订单 分页 + */ + @GetMapping("/getPackageListByStockArticleId") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionStockArticle") + public R> getPackageListByStockArticleId(@ApiIgnore @RequestParam Long orderId, Query query) { + IPage pages = distributionStockArticleService.getPackageListByStockArticleId(Condition.getPage(query), orderId); + return R.data(pages); + } + + /** * 查询零担订单详情 */ 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 ad335777f..d82d96d15 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 @@ -402,4 +402,12 @@ public interface DistributionDeliveryListMapper extends BaseMapper getReservationStockArticleByDeliveryId(@Param("delivaryListId") Long deliveryId); + + /** + * 查询配送计零担订单详情 + * @param orderId + * @param deliveryId + * @return + */ + List selectDeliveryZeroOrderDetail(@Param("orderId") Long orderId,@Param("deliveryListId") Long deliveryId); } 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 bc71db52b..71f0a11d1 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 @@ -1564,5 +1564,28 @@ where lddl.id = #{delivaryListId} + 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 13fb8b9b9..c43d06a2f 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 @@ -571,7 +571,8 @@