From 1746d978825853d6cf7f9977e4f45815a3cb8790 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sat, 11 Nov 2023 12:09:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/entity/DistributionStockListEntity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index cc3ba2524..0c5195464 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -292,6 +292,7 @@ public class DistributionStockListEntity extends TenantEntity { * 来源 1 订单 2 导入 */ @ApiModelProperty(value = "来源 1 订单 2 导入") + @TableField(exist = false) private String sourceType; From 23ba7d263c7a3c6b0af93e28441f86365e798b3a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sat, 11 Nov 2023 12:10:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionDeliveryListEntity.java | 2 ++ .../logpm/distribution/entity/DistributionStockListEntity.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) 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 bb7408aa9..9f3b2c909 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 @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -264,6 +265,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { * 客户名称 */ @ApiModelProperty(value = "客户名称") + @TableField(exist = false) private String clineName; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index 0c5195464..cc3ba2524 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -292,7 +292,6 @@ public class DistributionStockListEntity extends TenantEntity { * 来源 1 订单 2 导入 */ @ApiModelProperty(value = "来源 1 订单 2 导入") - @TableField(exist = false) private String sourceType; From 530350cfc411c6bc2fcf9a974418bb02d282405d Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sat, 11 Nov 2023 13:37:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 2 +- .../mapper/DistributionDeliveryListMapper.xml | 26 ++++++++++++++++--- .../mapper/DistributionReservationMapper.xml | 20 +++++++++++--- .../DistributionParcelListServiceImpl.java | 3 ++- .../impl/DistributionStockupServiceImpl.java | 24 +++++++++++++++++ 5 files changed, 66 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index d604e0af6..fd653f79f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -733,7 +733,7 @@ public class DistributionStockupAppController extends BladeController { WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity(); warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId()); warehouseUpdownGoodsEntity.setAssociationId(list.get(0).getId()); - warehouseUpdownGoodsEntity.setAssociationType("4"); + warehouseUpdownGoodsEntity.setAssociationType("3"); warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId()); locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity); if(locationInformation.isEmpty()){ 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 364c0e74c..f778e1201 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 @@ -60,8 +60,7 @@ - SELECT lddl.id id, lddl.train_number trainNumber, @@ -167,7 +166,6 @@ lddl.loading_time loadingTime, lddl.note_number noteNumber, lddl.source source, - lddl.vehicle_name vehicleName, ( SELECT COALESCE ( @@ -189,8 +187,11 @@ logpm_distribution_signfor lds WHERE lddl.id = lds.delivery_id - ) scannedNumber + ) scannedNumber, + GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName FROM logpm_distribution_delivery_list lddl + left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id + LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id lddl.is_deleted = 0 @@ -205,6 +206,9 @@ and lddl.warehouse_name like concat('%',#{param.warehouseName},'%') + + and ldr.consignee like concat('%',#{param.clineName},'%') + and lddl.vehicle_name like concat('%',#{param.vehicleName},'%') @@ -239,6 +243,20 @@ and date_format(lddl.task_time,'%y%m%d%') = date_format(#{param.taskTime},'%y%m%d%') + GROUP BY lddl.id , + lddl.train_number , + lddl.warehouse_name , + lddl.warehouse_id , + lddl.type , + lddl.kind , + lddl.vehicle_name , + lddl.driver_name , + lddl.vehicle_id , + lddl.driver_id , + lddl.distribution_company , + lddl.delivery_status , + lddl.delivery_list_loading_status + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 91ca358eb..b9168f351 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2051,6 +2051,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { //存在 queryWrapper.eq("coding",packetBarCode);