From 2b3a6c58a5471444fdaae490ee0c53fcf076a72e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 15:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=AC=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E8=BF=87=E6=BB=A4=E8=A3=85=E8=BD=A6=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E3=80=81=E9=A2=84=E7=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=AE=A2?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleController.java | 7 ++++++ .../dto/DistributionParcelListDTO.java | 2 ++ .../dto/DistributionStockArticleDTO.java | 6 +++++ .../mapper/DistributionDeliveryInfoMapper.xml | 22 ++++++++++--------- .../mapper/DistributionParcelListMapper.xml | 6 +++++ .../IDistributionStockArticleService.java | 1 + .../DistributionStockArticleServiceImpl.java | 3 +++ 7 files changed, 37 insertions(+), 10 deletions(-) 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 c5c4730f4..6795a0ad5 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 @@ -353,6 +353,13 @@ public class DistributionStockArticleController extends BladeController { return R.status(distributionStockArticleService.updateById(distributionStockArticle)); } + @PostMapping("/updateBatchClient") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionStockArticle") + public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) { + return R.status(distributionStockArticleService.updateBatchById(distributionStockArticleDTO.getEntityList())); + } + /** * 配送在库订单 新增或修改 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java index 6be069388..2b5dd0334 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java @@ -38,6 +38,8 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity { private Long materialId; private String materialName; private String materialCode; + private Integer isLoading; + private Integer isSigning; private String materialUnit; private Integer reservationNum; //预约数量 private String sku; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java index dc782a79f..0e07f02ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java @@ -71,5 +71,11 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity @TableField(exist = false) private List parcelNumberVOS; + /** + // * 零担订单品类信息 + // */ + @TableField(exist = false) + private List entityList; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 61bd18ca2..44d5cdbbe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -93,14 +93,6 @@ lds.received_quantity receivedQuantity, lds.is_have_abnormal_package isHaveAbnormalPackage, lds.signee_name signeeName, - (SELECT - ldss.forklift_name - FROM - logpm_distribution_stockup_info AS ldsi - LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id - WHERE - ldsi.reservation_id = lds.reservation_id - ) AS forkliftName, CASE WHEN ldr.stockup_status ='10' THEN '待指派' WHEN ldr.stockup_status ='20' THEN '待备货' @@ -118,10 +110,20 @@ CASE WHEN lds.driver_signing ='1' THEN '未完成' else '已完成' - END driverSigning + END driverSigning, + t.forklift_name AS forkliftName FROM logpm_distribution_signfor lds - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + LEFT JOIN (SELECT + ldss.forklift_name, + ldsi.reservation_id + FROM + logpm_distribution_stockup_info AS ldsi + LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id + WHERE + ldsi.reservation_id = lds.reservation_id + ) AS t ON t.reservation_id = ldsi.reservation_id lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 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 7ad7da730..f7d29e848 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 @@ -638,6 +638,12 @@ and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus} + and + ldpl.order_package_loading_status != 20 + + and + ldpl.order_package_status != 70 + and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 9a8fee6e1..f80b7252c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -232,4 +232,5 @@ public interface IDistributionStockArticleService extends BaseService queryWrapper = new QueryWrapper<>();