From f7165dc60fc12fe46a5624fdb1a3767d6ecfa817 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 1 Apr 2024 22:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=89=AB=E6=8F=8FBUG?= =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=A4=87=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionSignforStockArticleVO.java | 5 ++ .../mapper/DistributionStockArticleMapper.xml | 2 +- .../mapper/DistributionStockupMapper.java | 3 ++ .../mapper/DistributionStockupMapper.xml | 47 ++++++++++++++----- .../service/IDistributionStockupService.java | 7 +++ .../DistributionReservationServiceImpl.java | 6 +++ .../impl/DistributionSignforServiceImpl.java | 1 + .../impl/DistributionStockupServiceImpl.java | 32 +++++++++++++ .../DistrilbutionBillLadingServiceImpl.java | 6 +++ 9 files changed, 97 insertions(+), 12 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java index 8c4a893b1..5436f071d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java @@ -40,6 +40,11 @@ import java.util.Map; public class DistributionSignforStockArticleVO implements Serializable { private static final long serialVersionUID = 1L; + /** + * Id + */ + @ApiModelProperty(value = "Id") + private Long id; /** * 运单号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 0a3a2d76f..3c9be512d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -1107,11 +1107,11 @@ select COUNT(ldpl.id) @@ -245,8 +258,18 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id + LEFT JOIN ( + SELECT + IFNULL(COUNT( b.reservation_id ),0 )AS aaa, + b.stockup_id AS stockup_id + FROM + logpm_distribution_stockup AS a + LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id + WHERE b.stock_status != 4 + GROUP BY b.stockup_id + ) AS aa ON aa.stockup_id = lds.id - lds.is_deleted = 0 + lds.is_deleted = 0 AND aa.aaa > 0 AND ldsi.stock_status != 4 and lds.type_service = #{param.typeService} @@ -408,7 +431,7 @@ from logpm_distribution_stockup ds LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldsi.reservation_id - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 ) customer, ( select GROUP_CONCAT(DISTINCT lwug.position_code ) @@ -418,7 +441,7 @@ ldrp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id LEFT JOIN logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 ) warehouseArea , ( select GROUP_CONCAT(DISTINCT lwtg.tray_code) @@ -428,7 +451,7 @@ ldrp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id LEFT JOIN logpm_warehouse_tray_goods lwtg on ldpl.id = lwtg.association_id - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 ) trays, ( select COUNT(ldrs.id) @@ -436,7 +459,7 @@ LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id and ldrs.stock_article_status in (1,3) - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 ) orderNum , ( select COUNT(DISTINCT ldrp.id) @@ -444,7 +467,7 @@ LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id and ldrp.packet_bar_status in (1,3) - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 )planNum, ( select IFNULL(SUM(ldrs.reservation_num),0) @@ -452,14 +475,14 @@ LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldsi.reservation_id and ldrs.stock_list_status in (1,3) - where ds.id = lds.id + where ds.id = lds.id AND ldsi.stock_status != 4 ) inventoryNub from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldrs.stock_article_id - lds.is_deleted = 0 and lds.type_service in (1,2) + lds.is_deleted = 0 and lds.type_service in (1,2) AND ldsi.stock_status != 4 and lds.stockup_date between #{param.stockupDateStart} and #{param.stockupDateEnd} @@ -511,7 +534,7 @@ LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id and ldbs.order_status in (1,2) - lds.is_deleted = 0 and lds.type_service = 3 + lds.is_deleted = 0 and lds.type_service = 3 AND ldsi.stock_status != 4 and lds.stockup_date between #{param.stockupDateStart} and #{param.stockupDateEnd} @@ -735,7 +758,7 @@ from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id - lds.id = #{param.stockupId} + lds.id = #{param.stockupId} AND ldsi.stock_status != 4 @@ -886,6 +909,7 @@ from logpm_distribution_stockup_info ) and ldsi.stockup_id = #{param.id} and ldr.is_deleted = 0 + and ldsi.stock_status != 4 and ldr.stockup_status = #{param.stockupStatus} and ldr.mall_name = #{param.mallName} and lwug.position_code like concat('%', #{param.goodsAllocation},'%' ) @@ -915,6 +939,7 @@ ldsi.stockup_id = #{ id } AND ldsi.is_deleted = 0 + AND ldsi.stock_status != 4 @@ -957,7 +982,7 @@ LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id - ldsi.stockup_id =#{id} + ldsi.stockup_id =#{id} AND ldsi.stock_status != 4 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 4483bff64..6c597fe20 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -300,4 +300,11 @@ public interface IDistributionStockupService extends BaseService reservationIds = new ArrayList<>(); + reservationIds.add(reservationEntity.getId()); + Integer row = distributionStockupMapper.cancelStockUpTasks(reservationIds,stockupEntity.getId()); + log.info("#################取消预约，取消备货任务:{}",reservationEntity.getReservationCode()); } reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue()); this.updateById(reservationEntity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index d69b1628d..9fe496a77 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -569,6 +569,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailVOS = baseMapper.selectInventoryDetailByBillLadingIdAndStockListId(billLadingId,stockListId); return R.data(detailVOS); } + + /** + * @param reservationId + * @param type + */ + @Override + public void maintenanceStockUp(Long reservationId, Integer type) { + String method = "###############DistributionStockServiceImpl.maintenanceStockUp"; + switch (type){ + case 1: + //维护商配、市配问题 + List entityList = distributionStockupInfoService.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getReservationId, reservationId) + .ne(DistributionStockupInfoEntity::getStockUpType, "3") + ); + if (Func.isNotEmpty(entityList)){ + if (entityList.size() == 1){ + //进行备货任务 + + } else { + //一个预约任务对应了多个备货任务 + } + }else { + //查询预约任务错误 + + } + break; + case 2: + //自提备货 + break; + } + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index d96ce66ab..c176d6bdf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1826,6 +1826,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl