From 167c1f4cd0d554cc6ba8a1dcd34da06f10463e38 Mon Sep 17 00:00:00 2001 From: lihongjie <982264618@qq.com> Date: Wed, 2 Oct 2024 11:25:01 +0800 Subject: [PATCH 1/3] bugfix --- .../coal/weightDevice/entity/WeightDeviceEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java b/src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java index 5d996b11..342b704f 100644 --- a/src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java +++ b/src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java @@ -28,4 +28,13 @@ public class WeightDeviceEntity extends OrgCommonEntity { @ElementCollection private List reserveFieldConfigList; + + @Override + public String toString() { + + // display name and code with class name prefix + + return "WeightDeviceEntity(" + "location=" + this.getLocation() + ")"; + + } } From 7cf789d20806914d5be3c77dc97337df3340134e Mon Sep 17 00:00:00 2001 From: lihongjie <982264618@qq.com> Date: Wed, 2 Oct 2024 11:36:56 +0800 Subject: [PATCH 2/3] bugfix --- .../saleOrder/entity/SaleOrderEntity.java | 17 ++++ .../entity/WeightDeviceDataEntity.java | 97 +++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java b/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java index 0a552012..a2478151 100644 --- a/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java +++ b/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java @@ -109,4 +109,21 @@ public class SaleOrderEntity extends OrgCommonEntity { public void preUpdate() { super.preUpdate(); } + + + @Override + public String toString() { + return "SaleOrderEntity{" + + "amount=" + amount + + ", includeTax=" + includeTax + + ", taxRate=" + taxRate + + ", price=" + price + + ", otherFee=" + otherFee + + ", total=" + total + + ", orderStatus='" + orderStatus + '\'' + + ", finishTime=" + finishTime + + ", startTime=" + startTime + + ", dayAmount=" + dayAmount + + '}'; + } } diff --git a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java index 73bbade2..0eb2c0e1 100644 --- a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java +++ b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java @@ -501,4 +501,101 @@ public class WeightDeviceDataEntity extends OrgCommonEntity { && this.ecgbTime != null && this.ycgbTIme != null; } + + + @Override + public String toString() { + return "WeightDeviceDataEntity{" + + "sequenceNumber=" + sequenceNumber + + ", flowNumber='" + flowNumber + '\'' + + ", plateNo='" + plateNo + '\'' + + ", weighType='" + weighType + '\'' + + ", sendOrganization='" + sendOrganization + '\'' + + ", receiveOrganization='" + receiveOrganization + '\'' + + ", goods='" + goods + '\'' + + ", specification='" + specification + '\'' + + ", mz=" + mz + + ", pz=" + pz + + ", jz=" + jz + + ", kz=" + kz + + ", sz=" + sz + + ", price=" + price + + ", amount=" + amount + + ", zfxs=" + zfxs + + ", fl=" + fl + + ", weightFee=" + weightFee + + ", mzUser='" + mzUser + '\'' + + ", pzUser='" + pzUser + '\'' + + ", mzbh='" + mzbh + '\'' + + ", pzbh='" + pzbh + '\'' + + ", mzTime=" + mzTime + + ", pzTime=" + pzTime + + ", ycgbTIme=" + ycgbTIme + + ", ecgbTime=" + ecgbTime + + ", updateUser='" + updateUser + '\'' + + ", dataUpdateTime=" + dataUpdateTime + + ", remark='" + remark + '\'' + + ", printCount=" + printCount + + ", upload=" + upload + + ", reserve1='" + reserve1 + '\'' + + ", reserve2='" + reserve2 + '\'' + + ", reserve3='" + reserve3 + '\'' + + ", reserve4='" + reserve4 + '\'' + + ", reserve5='" + reserve5 + '\'' + + ", reserve6=" + reserve6 + + ", reserve7=" + reserve7 + + ", reserve8=" + reserve8 + + ", reserve9=" + reserve9 + + ", reserve10='" + reserve10 + '\'' + + ", reserve11='" + reserve11 + '\'' + + ", reserve12='" + reserve12 + '\'' + + ", reserve13='" + reserve13 + '\'' + + ", reserve14='" + reserve14 + '\'' + + ", reserve15=" + reserve15 + + ", reserve16=" + reserve16 + + ", reserve17=" + reserve17 + + ", reserve18=" + reserve18 + + ", clientType=" + clientType + + ", ycgbWeight=" + ycgbWeight + + ", ecgbWeight=" + ecgbWeight + + ", b0='" + b0 + '\'' + + ", aguid='" + aguid + '\'' + + ", planNumber='" + planNumber + '\'' + + ", recordCreateMode=" + recordCreateMode + + ", recordFinish=" + recordFinish + + ", netPriceSyncTime=" + netPriceSyncTime + + ", netPriceModifyUser='" + netPriceModifyUser + '\'' + + ", cTime=" + cTime + + ", modifyOnnet='" + modifyOnnet + '\'' + + ", modifyTime=" + modifyTime + + ", modifyBy='" + modifyBy + '\'' + + ", auditFlag='" + auditFlag + '\'' + + ", auditTime=" + auditTime + + ", auditBy='" + auditBy + '\'' + + ", eUpimg='" + eUpimg + '\'' + + ", reserve19='" + reserve19 + '\'' + + ", reserve20='" + reserve20 + '\'' + + ", reserve21='" + reserve21 + '\'' + + ", reserve22='" + reserve22 + '\'' + + ", reserve23='" + reserve23 + '\'' + + ", reserve24='" + reserve24 + '\'' + + ", reserve25='" + reserve25 + '\'' + + ", reserve26='" + reserve26 + '\'' + + ", reserve27='" + reserve27 + '\'' + + ", reserve28='" + reserve28 + '\'' + + ", driverInfo='" + driverInfo + '\'' + + ", hqbUpImgG1=" + hqbUpImgG1 + + ", hqbUpImgG2=" + hqbUpImgG2 + + ", hqbUpImgG3=" + hqbUpImgG3 + + ", hqbUpImgG4=" + hqbUpImgG4 + + ", hqbUpImgT1=" + hqbUpImgT1 + + ", hqbUpImgT2=" + hqbUpImgT2 + + ", hqbUpImgT3=" + hqbUpImgT3 + + ", hqbUpImgT4=" + hqbUpImgT4 + + ", archiveStatus='" + archiveStatus + '\'' + + ", minTime=" + minTime + + ", invalid=" + invalid + + ", finished=" + finished + + '}'; + } } From e7369de7f67542b4e14cd8ddfcfded3e8f815362 Mon Sep 17 00:00:00 2001 From: lihongjie <982264618@qq.com> Date: Wed, 2 Oct 2024 12:21:07 +0800 Subject: [PATCH 3/3] bugfix --- .../service/CoalWashingDailyAnalysisService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java index 8ee44a4d..4368c6a2 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java @@ -16,6 +16,7 @@ import cn.lihongjie.coal.common.FreeMakerUtils; import cn.lihongjie.coal.common.JpaUtils; import cn.lihongjie.coal.exception.BizException; +import cn.lihongjie.coal.product.service.ProductService; import com.google.common.base.CaseFormat; import jakarta.annotation.PostConstruct; @@ -63,7 +64,7 @@ public class CoalWashingDailyAnalysisService validate(entity); if (entity.getProduct()!=null){ - entity.setName(entity.getProduct().getName()); + entity.setName(productService.get(entity.getProduct().getId()).getName()); } this.repository.save(entity); @@ -93,6 +94,9 @@ public class CoalWashingDailyAnalysisService return mapper.toDto(roundMapper.round(entity)); } + @Autowired + ProductService productService; + public CoalWashingDailyAnalysisDto update(UpdateCoalWashingDailyAnalysisDto request) { @@ -108,7 +112,8 @@ public class CoalWashingDailyAnalysisService validate(entity); if (entity.getProduct()!=null){ - entity.setName(entity.getProduct().getName()); + + entity.setName(productService.get(entity.getProduct().getId()).getName()); } this.repository.save(entity);