From 22d7b32fc97ed3a2dc81f594e510f037762f7c6e Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 6 Nov 2024 16:29:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=BF=97=E9=82=A6=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改志邦工厂自定义数据回传逻辑，增加发货单号过滤 --- .../factorydata/zbom/entity/CustomPushEntity.java | 3 +++ .../logpm/factorydata/zbom/job/CustomPushJob.java | 15 ++++++++++++++- .../factorydata/zbom/mapper/CustomPushMapper.xml | 8 ++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/entity/CustomPushEntity.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/entity/CustomPushEntity.java index 8e40ba191..d05ee7a0d 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/entity/CustomPushEntity.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/entity/CustomPushEntity.java @@ -25,6 +25,9 @@ public class CustomPushEntity extends BaseEntity { @ApiModelProperty(name = "订单号", notes = "") private String orderCode; + @ApiModelProperty(name = "工厂车次号", notes = "") + private String departCode; + @ApiModelProperty(name = "仓库", notes = "") private String warehouse; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/job/CustomPushJob.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/job/CustomPushJob.java index f0a467617..b82579fc3 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/job/CustomPushJob.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/job/CustomPushJob.java @@ -332,7 +332,7 @@ public class CustomPushJob { int size1 = customPushEntities.size(); List list = orderPackageService.list(Wrappers.lambdaQuery() - .select(ZbOrderPackageEntity::getDepartCode) + .select(ZbOrderPackageEntity::getDepartCode, ZbOrderPackageEntity::getPackageCode) .eq(ZbOrderPackageEntity::getPackageCode, customPushEntity.getPackageCode()) ); if (CollUtil.isNotEmpty(list)) { @@ -387,6 +387,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, "-1") .set(CustomPushEntity::getResult, "工厂返回异常") @@ -411,6 +412,10 @@ public class CustomPushJob { .build(); // 推送成功 nodePushService.save(pushEntity); + orderPackageService.update(Wrappers.lambdaUpdate() + .set(ZbOrderPackageEntity::getSignStatus, 1) + .in(ZbOrderPackageEntity::getPackageCode, customPushEntities.stream().map(CustomPushEntity::getPackageCode).collect(Collectors.toSet())) + ); // 修改加盟商单号+发货单号节点数据 List list2 = nodeOrderService.list(Wrappers.lambdaQuery() .eq(ZbFactoryNodeOrderEntity::getPlatformOrderCode, customPushEntity.getOrderCode()) @@ -432,6 +437,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, code) .set(CustomPushEntity::getResult, result) @@ -441,6 +447,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, code) .set(CustomPushEntity::getResult, result)); @@ -459,6 +466,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, "-1") .set(CustomPushEntity::getResult, "未找到包件订单-发货单订单") @@ -468,6 +476,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, "-1") .set(CustomPushEntity::getResult, "未找到包件订单-包件") @@ -559,6 +568,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, code) .set(CustomPushEntity::getResult, result) @@ -568,6 +578,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, code) .set(CustomPushEntity::getResult, result)); @@ -585,6 +596,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, "-1") .set(CustomPushEntity::getResult, "push里有记录") @@ -594,6 +606,7 @@ public class CustomPushJob { customPushService.update(Wrappers.lambdaUpdate() .eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId()) .eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) + .eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode()) .set(CustomPushEntity::getSendStatus, type) .set(CustomPushEntity::getResultCode, "-1") .set(CustomPushEntity::getResult, "未找到包件订单") diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/CustomPushMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/CustomPushMapper.xml index 9997e1f91..9add9de76 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/CustomPushMapper.xml +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/CustomPushMapper.xml @@ -3,15 +3,15 @@