lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcProductDayscheduleMapper.xml
@@ -9,7 +9,7 @@ <select id="findYesterdayData" resultType="org.jeecg.modules.mdcJc.entity.MdcProductDayschedule"> SELECT SUM ( planCount ) planDate, SUM ( planCount ) planCount, SUM ( completionCount ) completionCount, SUM ( qualifiedCount ) qualifiedCount FROM lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/EquipmentXYZDto.java
@@ -19,11 +19,11 @@ @ApiModelProperty(value = "轴类型") private String axisType; @ApiModelProperty(value = "绝对坐标") private String absolute; private String absolute = "0"; @ApiModelProperty(value = "机床坐标") private String machine; private String machine = "0"; @ApiModelProperty(value = "相对坐标") private String relative; private String relative = "0"; @ApiModelProperty(value = "轴温度") private String temperature = "0"; @ApiModelProperty(value = "伺服跟随误差") lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml
@@ -32,6 +32,8 @@ LEFT JOIN mdc_production_equipment t3 ON t1.id = t3.equipment_id WHERE t3.production_id = #{productionId} ORDER BY t1.sort_no </select> <!--刀具寿命列表--> lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -125,7 +125,9 @@ equipmentRateDto.setEquipmentName(mdcEfficiencyDto.getEquipmentName()); equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP)); equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP)); result.add(equipmentRateDto); if (!equipmentRateDto.getOpenRate().equals(BigDecimal.ZERO) || !equipmentRateDto.getUtilizationRate().equals(BigDecimal.ZERO)) { result.add(equipmentRateDto); } } } return result; @@ -147,7 +149,9 @@ meu.setDate(new StringBuilder(mdcEfficiencyDto.getTheDate().substring(4, 8)).insert(2, "-").toString()); BigDecimal equipmentCount = mdcLargeScreenMapper.findEquipmentCount(yesterday); meu.setUtilizationRate(mdcEfficiencyDto.getProcessLong().divide(equipmentCount.multiply(new BigDecimal("86400")), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP)); result.add(meu); if (!meu.getUtilizationRate().equals(BigDecimal.ZERO)) { result.add(meu); } } } return result; lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
@@ -199,9 +199,11 @@ for (DictModel dictModel : dictList) { EquipmentXYZDto equipmentXYZDto = new EquipmentXYZDto(); equipmentXYZDto.setAxisType(dictModel.getText()); equipmentXYZDto.setAbsolute(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine").toString()); equipmentXYZDto.setMachine(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine").toString()); equipmentXYZDto.setRelative(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Absolute") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Absolute").toString()); if (jsonEquipmentXYZ != null) { equipmentXYZDto.setAbsolute(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine").toString()); equipmentXYZDto.setMachine(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Machine").toString()); equipmentXYZDto.setRelative(jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Absolute") == null ? null : jsonEquipmentXYZ.get(dictModel.getText().toLowerCase() + "Absolute").toString()); } if (mapData != null) { equipmentXYZDto.setTemperature(mapData.get("motorTemperature" + dictModel.getText()) == null ? "0" : mapData.get("motorTemperature" + dictModel.getText()).toString()); equipmentXYZDto.setLag(mapData.get("lag" + dictModel.getValue()) == null ? "0.000" : mapData.get("lag" + dictModel.getValue()).toString());
