From 228c2b99f15d2b4d7d49860a56e1e9762610bcb0 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 15 Aug 2023 18:44:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 1 + .../vo/DistributionParcelListBaseVO.java | 32 +++++++++++++++++++ .../DistributionParcelListController.java | 13 ++++++++ .../mapper/DistributionParcelListMapper.java | 3 ++ .../mapper/DistributionParcelListMapper.xml | 17 +++++++++- .../IDistributionParcelListService.java | 2 ++ .../DistributionParcelListServiceImpl.java | 22 +++++++++++++ .../DistributionStockArticleWrapper.java | 1 + 8 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListBaseVO.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 9908a5e11..2c9ae1bbb 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -28,6 +28,7 @@ public class DictBizConstant { public static final String CERTIFICATE_TYPE = "certificate_type";//证件类型 public static final String DELIVERY_COST = "delivery_cost";//证件类型 public static final String LOGPM_UNIT = "logpm_unit";//包间上架状态 + public static final String ORDER_RECEIVE_STATUS = "order_receive_status";//包间上架状态 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListBaseVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListBaseVO.java new file mode 100644 index 000000000..08c681b5a --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListBaseVO.java @@ -0,0 +1,32 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-15 16:12 + **/ +@Data +public class DistributionParcelListBaseVO { + + private String waybillNumber; + private String frozenQuantity; + private String signinQuantity; + private String deliveryQuantity; + private String handQuantity; + private String sendWarehouseName; + private String factoryTrain; + private String trainNumber; + private String dealerCode; + private String dealerName; + private String typeService; + private String typeServiceName; + private String brand; + private String warehouse; + private String mallName; + private String orderCode; + private String serviceNumber; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 12a58f517..4eb391aee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; import com.logpm.distribution.dto.DistributionParcelListDTO; +import com.logpm.distribution.vo.DistributionParcelListBaseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -107,6 +108,18 @@ public class DistributionParcelListController extends BladeController { return R.data(pages); } + /** + * 在库订单包件清单 + */ + @GetMapping("/stockDataBase") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionParcelList") + public R> getStockDataBase(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { + + List pages = distributionParcelListService.getStockDataBase(distributionParcelList); + return R.data(pages); + } + /** * 在库订单包件清单 自定义分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 4461272c9..03901aaf2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -18,6 +18,7 @@ package com.logpm.distribution.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.vo.DistributionParcelListBaseVO; import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -70,4 +71,6 @@ public interface DistributionParcelListMapper extends BaseMapper getPageVOList(Page objectPage, Long id); + + List getStockDataBase(@Param("param") DistributionParcelListEntity parcelListEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 93fbdeb96..8e830fd16 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -38,7 +38,22 @@ - +