diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java index a079d7ac3..0b2edfd88 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java @@ -12,8 +12,8 @@ public class IEquipmentVO { private Double failureRate; // 设备有效利用率 private Double utilizationRatio; - // 设备维修质量 - private Double rapairQuantity; + // 设备维修质量 拼错了！！！！！ + private String rapairQuantity; // 设备状态 private String equipmentStatus; @@ -25,11 +25,11 @@ public class IEquipmentVO { this.equipmentStatus = equipmentStatus; } - public Double getRapairQuantity() { + public String getRapairQuantity() { return rapairQuantity; } - public void setRapairQuantity(Double rapairQuantity) { + public void setRapairQuantity(String rapairQuantity) { this.rapairQuantity = rapairQuantity; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java index 05406ff0d..68ef5667d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java @@ -26,6 +26,7 @@ public interface DeviceInterfaceMapper { * @return */ List selectEquipmentList(EquOperation equOperation); + List selectEquipmentVOList(EquOperation equOperation); /** * 获取维修工单中设备信息 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 0a560a28c..238a36b6f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -53,7 +53,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { /** * 获取设备信息 * 故障停机率:（设备停机时间总和/一定时间内运行总时间（年）） - * 设备有效利用率：（实际产量/理论产量） + * 设备有效利用率：（实际产量/理论产量）改为：一定天数内该设备的总开机时间/（天数*24小时） * * @return */ @@ -61,10 +61,10 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @DS("#header.poolName") public AjaxResult getEquipmentInfo(EquOperation equOperation) { if (equOperation.getTimeDimension() == null) { - equOperation.setTimeDimension("dd"); + equOperation.setTimeDimension("yyyy"); } // 获取所有设备信息 - List equipmentVOList = deviceInterfaceMapper.selectEquipmentList(equOperation); + List equipmentVOList = deviceInterfaceMapper.selectEquipmentVOList(equOperation); return success(equipmentVOList); } @@ -95,26 +95,26 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { runTime += diffTime; } // 计算维修质量（故障时间（小时）/故障次数） - double rapairQuantity = runTime / 3600000 / workOrderList.size(); - equipmentVO.setRapairQuantity(Double.valueOf(rapairQuantity)); + Double rapairQuantity = runTime / 3600000 / workOrderList.size(); + String douStr = String.format("%.2f", rapairQuantity); + equipmentVO.setRapairQuantity(douStr); } else { // 没有该记录则默认为0 - equipmentVO.setRapairQuantity(0D); + equipmentVO.setRapairQuantity("0.00"); } } // 按照raparQuantity字段进行排序，并使用subList获取前10个结果 List top10 = equipmentVOList.stream() - .sorted(Comparator.comparingDouble(IEquipmentVO::getRapairQuantity)) // 排序 - .limit(10) // 限制结果数量为10 - .collect(Collectors.toList()); // 将结果收集到List中 - + .sorted(Comparator.comparing(IEquipmentVO::getRapairQuantity).reversed())// 由正序改为 反转排序 倒序 + .limit(10) // 限制结果数量为10 改为不限制结果数量 + .collect(Collectors.toList()); //将结果收集到List中 return success(top10); } /** - * 设备稳定性-MTBF top10 + * 设备稳定性-MTBF * 公式：实际运转时间/停机次数 */ @Override @@ -132,13 +132,12 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { /** * 完好设备占比 - * 公式：维修/故障设备 + * 公式：（所有设备-故障设备）/所有设备 */ @Override @DS("#header.poolName") public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { //查询所有设备（设备停用的除外） - // CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation); Double totalEquipment = new Double(equipmentIntactRate.getTotalEquipment()); Double operationEquipment = new Double(equipmentIntactRate.getOperationEquipment()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 77360fa08..3698d7ec3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -150,7 +150,14 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); - return equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + int result = equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + + //2.修改设备状态 + EquEquipment equEquipment = new EquEquipment(); + equEquipment.setEquipmentCode(equipmentCode); + equEquipment.setEquipmentStatus("0");//0故障 + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + return result; } /** diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index b21f9adb5..05bcf3876 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -21,7 +21,8 @@ + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 85808be7e..33b8d2602 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -529,24 +529,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + and belong_goal_id = #{belongGoalId} + + + and supplier_code = #{supplierCode} + + + and supplier_name like concat('%', #{supplierName}, '%') + + + and attr1 = #{attr1} + + + and attr2 = #{attr2} + + + and attr3 = #{attr3} + + + and attr4 = #{attr4} + + + and factory_code = #{factoryCode} + + + + + + + + insert into qc_goal_distribute + + id, + + belong_goal_id, + + supplier_code, + + supplier_name, + + attr1, + + attr2, + + attr3, + + attr4, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + + + #{id}, + + #{belongGoalId}, + + #{supplierCode}, + + #{supplierName}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{attr4}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + + + + + update qc_goal_distribute + + belong_goal_id = + #{belongGoalId}, + + supplier_code = + #{supplierCode}, + + supplier_name = + #{supplierName}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + attr4 = + #{attr4}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + + where id = #{id} + + + + delete from qc_goal_distribute where id = #{id} + + + + delete from qc_goal_distribute where id in + + #{id} + + + + + delete from qc_goal_distribute where belong_goal_id = #{belongGoalId} + + + + + + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml new file mode 100644 index 000000000..ea8481884 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, goal_ym, goal_type, noOk_rate, noOk_quality_rate, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, check_type, type_code, scope, parent_goal from qc_goal + + + + + + + + + + insert into qc_goal + + id, + + goal_ym, + + goal_type, + + noOk_rate, + + noOk_quality_rate, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + check_type, + + type_code, + + scope, + + parent_goal, + + + + #{id}, + + #{goalYm}, + + #{goalType}, + + #{nookRate}, + + #{nookQualityRate}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{checkType}, + + #{typeCode}, + + #{scope}, + + #{parentGoal}, + + + + + + insert into qc_goal(id,goal_ym,goal_type,noOk_rate,noOk_quality_rate,create_by,create_time, + update_by,update_time,factory_code,check_type,type_code,scope,parent_goal)values + + (#{item.id}, + #{item.goalYm}, + #{item.goalType}, + #{item.nookRate}, + #{item.nookQualityRate}, + #{item.createBy}, + #{item.createTime}, + #{item.updateBy}, + #{item.updateTime}, + #{item.factoryCode}, + #{item.checkType}, + #{item.typeCode}, + #{item.scope}, + #{item.parentGoal}) + + + + + + update qc_goal + + goal_ym = + #{goalYm}, + + goal_type = + #{goalType}, + + noOk_rate = + #{nookRate}, + + noOk_quality_rate = + #{nookQualityRate}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + check_type = + #{checkType}, + + type_code = + #{typeCode}, + + scope = + #{scope}, + + parent_goal = + #{parentGoal}, + + + where id = #{id} + + + + + delete from qc_goal where id = #{id} + + + + delete from qc_goal where id in + + #{id} + + + diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 7be1d435f..0c4d03a11 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -228,7 +228,7 @@ public class SapOrderServiceImpl implements SapOrderService { // JCoDestination dest = SAPConnUtils.connect(); log.info("订单关闭入参------"+sapCloseOrderQuery.toString()); JCoRepository repository = dest.getRepository(); - JCoFunction func = repository.getFunction("ZPPR_MES_PRODORD_CLOSE"); + JCoFunction func = repository.getFunction("ZMES_AUFNR_CLOSE"); if (func == null) { throw new RuntimeException("Function does not exist in SAP"); }