From 1ebf512fe7cd4c32ff9089103a0cc0056628d38b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Sat, 28 Sep 2024 22:44:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E4=BB=93=E7=A7=9F=E6=88=90=E6=9C=AC=E8=AE=A1=E7=AE=97=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/DeliverFinishReportListener.java | 1 + .../report/QualityDeliverListener.java | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index ffffe7328..038fcaefa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -133,6 +133,7 @@ public class DeliverFinishReportListener { QualityDeliverEntity entity = new QualityDeliverEntity(); entity.setId(qualityDeliverEntity.getId()); entity.setCarComplateTime(new Date()); + entity.setConditions(qualityDeliverEntity.getConditions()); // 查询品类 BasicdataFactoryCategoryEntity param = new BasicdataFactoryCategoryEntity(); param.setBrand(qualityDeliverEntity.getBrandName()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java index b222fd006..bfcc3910d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java @@ -98,9 +98,13 @@ public class QualityDeliverListener { if (ObjectUtil.equals(bean.getOperation(), BizOperationEnums.MODIFY)) { if (ObjectUtil.equals(PackageTypeEnums.CMP.getCode(), conditions)) { // 定制品 - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(QualityDeliverEntity::getOrderPackageCode, qualityDeliverEntity.getOrderPackageCode()) - .lt(QualityDeliverEntity::getBizStatus, 110); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if(ObjectUtil.isNotEmpty(qualityDeliverEntity.getId())){ + wrapper.eq(QualityDeliverEntity::getId, qualityDeliverEntity.getId()); + }else{ + wrapper.eq(QualityDeliverEntity::getOrderPackageCode, qualityDeliverEntity.getOrderPackageCode()); + } + wrapper.lt(QualityDeliverEntity::getBizStatus, 110); saveOrUpdate(wrapper, qualityDeliverEntity); } else if (ObjectUtil.equals(PackageTypeEnums.INV.getCode(), conditions)) { // 库存品 @@ -112,10 +116,14 @@ public class QualityDeliverListener { saveOrUpdate(wrapper, qualityDeliverEntity); } else if (ObjectUtil.equals(PackageTypeEnums.LTL.getCode(), conditions)) { // 零担 - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(QualityDeliverEntity::getOrderCode, qualityDeliverEntity.getOrderCode()) - .eq(QualityDeliverEntity::getCategory, qualityDeliverEntity.getCategory()) - .lt(QualityDeliverEntity::getBizStatus, 110); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if(ObjectUtil.isNotEmpty(qualityDeliverEntity.getId())){ + wrapper.eq(QualityDeliverEntity::getId, qualityDeliverEntity.getId()); + }else{ + wrapper.eq(QualityDeliverEntity::getOrderCode, qualityDeliverEntity.getOrderCode()) + .eq(QualityDeliverEntity::getCategory, qualityDeliverEntity.getCategory()); + } + wrapper.lt(QualityDeliverEntity::getBizStatus, 110); if (StrUtil.isNotEmpty(qualityDeliverEntity.getBizCode())) { wrapper.eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode()); }