feat(all): 修改日仓租成本计算校验

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());

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<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>lambdaQuery()
-					.eq(QualityDeliverEntity::getOrderPackageCode, qualityDeliverEntity.getOrderPackageCode())
-					.lt(QualityDeliverEntity::getBizStatus, 110);
+				LambdaQueryWrapper<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>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<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>lambdaQuery()
-					.eq(QualityDeliverEntity::getOrderCode, qualityDeliverEntity.getOrderCode())
-					.eq(QualityDeliverEntity::getCategory, qualityDeliverEntity.getCategory())
-					.lt(QualityDeliverEntity::getBizStatus, 110);
+				LambdaQueryWrapper<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>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());
 				}