lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java
#	src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java
#	src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
This commit is contained in:
lihongjie0209
2024-10-02 14:13:10 +08:00
parent 8f40e93de7 e7369de7f6
commit e513260226
4 changed files with 133 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java
View File

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

19
src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java
View File

@@ -112,4 +112,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 +
'}';
}
}

11
src/main/java/cn/lihongjie/coal/weightDevice/entity/WeightDeviceEntity.java
View File

@@ -31,4 +31,13 @@ public class WeightDeviceEntity extends OrgCommonEntity {
@ElementCollection
private List<ReserveFieldConfig> reserveFieldConfigList;
}
@Override
public String toString() {
// display name and code with class name prefix
return "WeightDeviceEntity(" + "location=" + this.getLocation() + ")";
}
}

99
src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
View File

@@ -504,4 +504,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 +
'}';
}
}