From 234a2186ed319b1654d417af1fa25d58a6397aeb Mon Sep 17 00:00:00 2001 From: xiachao Date: Wed, 25 Dec 2024 17:46:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/thing/carbontrack/bom/dto/IotCarbonBomDTO.java | 3 +++ .../thing/carbontrack/bom/entity/IotCarbonBomEntity.java | 3 +++ .../standardcal/listener/ProductionResultListener.java | 4 ++++ .../thing/carbontrack/productionResult/dto/MptDetail.java | 6 ++++++ .../src/main/resources/mapper/IotCarbonBomMapper.xml | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/dto/IotCarbonBomDTO.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/dto/IotCarbonBomDTO.java index 17ae649..9aac611 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/dto/IotCarbonBomDTO.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/dto/IotCarbonBomDTO.java @@ -37,6 +37,9 @@ public class IotCarbonBomDTO implements Serializable { private BigDecimal weight; @Schema(description = "重量重量计量单位") private String w_unit; + @Schema(description = "重量重量计量父级描述") + private String unitStr; + @Schema(description = "原料用量") private BigDecimal dosage; @Schema(description = "供应商编码") diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/entity/IotCarbonBomEntity.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/entity/IotCarbonBomEntity.java index 2f44932..9848c36 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/entity/IotCarbonBomEntity.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/bom/entity/IotCarbonBomEntity.java @@ -101,4 +101,7 @@ public class IotCarbonBomEntity implements Serializable { private BigDecimal transportUse; //物料单耗 private BigDecimal muFinalUse; + + + private String unitStr; } \ No newline at end of file diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java index a2062e9..9734bb1 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java @@ -294,6 +294,7 @@ public class ProductionResultListener { entity = IotCarbonProductionResultEntity.initDto(production,"1", carbonReq.getMuFinalUse(),carbonReq.getTransportUse(),uintTransportTotalCarbon,uintCarbon); entityList.forEach(temp->{ + temp.setW_unit(temp.getWwunit()); temp.setAcquireCarbon(temp.getAcquireCarbon().divide(new BigDecimal(production.getFinalNum()),4,RoundingMode.UP)); temp.setDosage(temp.getDosage().divide(new BigDecimal(production.getFinalNum()),4,RoundingMode.UP)); temp.setTransportUse(temp.getTransportUse().divide(new BigDecimal(production.getFinalNum()),4,RoundingMode.UP)); @@ -304,6 +305,9 @@ public class ProductionResultListener { //初始化运输结果 entity = IotCarbonProductionResultEntity.initDto(production,"1", totalCarbon,transportTotalCarbon,carbonReq.getTransportUse(),carbonReq.getMuFinalUse()); + entityList.forEach(temp->{ + temp.setW_unit(temp.getWwunit()); + }); } entity.setJson(JSONObject.toJSONString(entityList)); //do update 还是 insert 产品bom来说，根据 产品id，工单编码，类型，来判断是否已存在 diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java index c121743..f896672 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java @@ -56,6 +56,12 @@ public class MptDetail { private Long num; + private String wwunit; + + public void setW_unit(String wwunit) { + this.w_unit = wwunit; + } + public MptDetail add(MptDetail other) { if (Objects.equals(getMaterialCode(), other.getMaterialCode())) { setDosage(AggUtil.sum(totalDosage(), other.totalDosage())); diff --git a/modules/carbon-track/src/main/resources/mapper/IotCarbonBomMapper.xml b/modules/carbon-track/src/main/resources/mapper/IotCarbonBomMapper.xml index 06989e1..0602e5c 100644 --- a/modules/carbon-track/src/main/resources/mapper/IotCarbonBomMapper.xml +++ b/modules/carbon-track/src/main/resources/mapper/IotCarbonBomMapper.xml @@ -22,7 +22,7 @@ aa.unit, aa.dosage as dosage, aa.weight, - aa.w_unit, + aa.w_unit as wwunit , aa.mu_final_use as acquireCarbon, aa.supplier_name, aa.supplier_address,