From 3cb6433fc9faa56cefd51815336ce18c12178dca Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 15 Oct 2024 20:23:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=9B=9E=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 配送明细中增加回库数量字段 --- .../com/logpm/distribution/entity/QualityDeliverEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java index 65b6939d9..ddf366d28 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java @@ -589,6 +589,11 @@ public class QualityDeliverEntity extends TenantEntity { */ @ApiModelProperty(value = "滞留时间") private String retentionTime; + /** + * 滞留数量 + */ + @ApiModelProperty(value = "滞留数量") + private Integer retentionNum; /** * 配送成本 */ From 4d998cb3712dad97a59fe5a9ed1a9575f091e850 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 15 Oct 2024 20:30:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E5=A4=87=E8=B4=A7=E5=88=97=E8=A1=A8=E7=9A=84=E8=B4=A7?= =?UTF-8?q?=E7=89=A9=E4=BF=A1=E6=81=AF=E5=92=8C=E6=89=98=E7=9B=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockupMapper.xml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 559f303e2..bac6b3970 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -259,15 +259,12 @@ lds.type_service typeService, lds.outbound_date outboundDate, lds.stockup_code stockupCode, - COALESCE ( group_concat( DISTINCT ldpl.goods_allocation SEPARATOR ',' ), '' ) AS stockipAllocation, - COALESCE ( group_concat( DISTINCT ldpl.pallet SEPARATOR ',' ), '' ) AS pallet, COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee FROM logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id - LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id lds.is_deleted = 0 AND ldsi.stock_status != 4 @@ -356,14 +353,14 @@ lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, - COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '')stockipAllocation, - COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet, + + COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2) - LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id + LEFT JOIN ( SELECT @@ -391,12 +388,6 @@ and lds.stockup_user like concat('%',#{param.stockupUser},'%') - and ldpl.goods_allocation - like concat('%',#{param.stockipAllocation},'%') - - and ldpl.pallet - like concat('%',#{param.pallet},'%') - and lds.stockup_code like concat('%',#{param.stockupCode},'%') From 36bddf78453732727081de8514f227e804242e35 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 15 Oct 2024 20:37:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=B8=A0=E9=81=93=E3=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E3=80=81=E8=B4=A6=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/entity/BasicdataDriverArteryEntity.java | 2 +- .../controller/BasicdataDriverArteryController.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 401985485..3d97a95c6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -225,7 +225,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity { * 结算渠道 */ @ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金") - private Integer settlementChannel ; + private String settlementChannel ; /** * 结算渠道 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 638f523b8..e807b80ea 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -61,12 +61,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -234,6 +229,9 @@ public class BasicdataDriverArteryController extends BladeController { if (null != basicdataDriverArtery.getBindVehicles()) { basicdataDriverArteryService.updateVehicle(basicdataDriverArtery); } + if (Objects.isNull(basicdataDriverArtery.getSettlementChannel())){ + basicdataDriverArtery.setSettlementChannel(""); + } boolean b = basicdataDriverArteryService.updateById(basicdataDriverArtery); if (b) { List warehouseIds = basicdataDriverArtery.getWarehouseIds();