From 17412cbf58d3ae32c6072913ec1c8622572d1ddf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 21 Aug 2024 17:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E6=92=AD=E8=8A=82=E7=82=B9=E3=80=81?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8=E6=95=B0?=
=?UTF-8?q?=E9=87=8F=E3=80=81=E5=A4=8D=E6=A0=B8=E6=96=87=E5=91=98=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/constant/WorkNodeEnums.java | 3 +++
.../constant/broadcast/FanoutConstants.java | 7 +++++++
.../mapper/DistrilbutionBillLadingMapper.xml | 10 ++++------
.../DistributionDeliveryListServiceImpl.java | 5 ++++-
.../impl/DistributionSignforServiceImpl.java | 16 ++++++++--------
5 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
index fdb7aa2fa..2662ebec6 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
@@ -60,13 +60,16 @@ public enum WorkNodeEnums implements Serializable {
PLANNED_RESERVATION(301010, "计划预约"),
PLAN_DELIVERY(301020, "计划配送"),
+ DISTRIBUTION_EDIT(301025, "配送计划编辑"),
CANCEL_DELIVERY(301030, "计划取消"),
PLAN_BILLOFLADING(301040, "计划自提"),
+ EDIT_BILLOFLADING(301045, "自提计划编辑"),
CANCEL_BILLOFLADING(301050, "取消自提"),
SIGN_BILLOFLADING(301080, "自提签收"),
PLAN_DISTRIBUTION(301060, "计划配车"),
CANCEL_DISTRIBUTION(301070, "取消配车"),
+
DISTRIBUTION_LOADING(302010, "配送装车"),
DISTRIBUTION_ABNORMAL_LOADING(302020, "异常装车"),
DISTRIBUTION_CANCEL_LOADING(302030, "取消装车"),
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
index 852a02c3a..8c504beb8 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
@@ -162,6 +162,13 @@ public abstract class FanoutConstants {
* 配送
*/
public interface distribution {
+ // 配送计划
+ // bianji'
+
+
+
+
+
interface signfor{
String EXCHANGE = "fanout.distribution.signfor" + ModuleNameConstant.DEVAUTH;
interface QUEUE {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index b1aca42d6..113fbc0a2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -80,7 +80,6 @@
-
GROUP BY
dbl2.pickup_batch,
ldpl2.SECOND
@@ -95,7 +94,6 @@
LEFT JOIN (
SELECT
CASE
-
WHEN
k.id IS NULL THEN
m.id
@@ -172,11 +170,11 @@
and dbl.pickup_batch like
concat('%',#{param.pickupBatch},'%')
- and
- DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
+
+ AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
- and
- AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
+
+ AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
and dbl.warehouse_id in
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index fecf4a1e7..1b5178c30 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -639,6 +639,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl pushList = new ArrayList<>();
@@ -1083,7 +1087,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderO(distributionAppDeliveryListVO);
List deliveryStockArticleInfo = distributionDeliveryListMapper.getDeliveryStockArticleInfo(distributionAppDeliveryListVO.getId());
-// deliveryStockArticleInfo.forEach();
List distributionReservationEntities = distributionDeliveryListMapper.selectReservationByDeliveryListId(distributionAppDeliveryListVO.getId());
distributionReservationEntities.forEach(r -> {
List reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(r.getId());
@@ -5969,14 +5968,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImplupdate().lambda()
+ .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
+ .set(DistributionSignforEntity::getDriverSigning, "2")
+ .set(!Objects.isNull(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, "2")
+ );
log.info("执行批量保存 {}", distributionSignPrintList);
return iDistributionSignPrintService.saveBatch(distributionSignPrintList);
}
- this.update(Wrappers.update().lambda()
- .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
- .set(DistributionSignforEntity::getDriverSigning, "2")
- .set(!Objects.isNull(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, "2")
- );
+
}
return false;