Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日生产效率报表

Browse Source
master
zhaoxiaolin 2 weeks ago
parent 8ef77313cf
commit 867239f109
11 changed files with 170 additions and 69 deletions
Show Stats Download Patch File Download Diff File

4
op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java
Unescape Escape View File

@ -212,8 +212,8 @@ public class MesLineAssistantQtyController extends BaseController {
// workbook.dispose(); // workbook.dispose();
// } // }
// } // }
ExcelUtil<MesDailyEfficiencyVo> util = new ExcelUtil<MesDailyEfficiencyVo>(MesDailyEfficiencyVo. class); // ExcelUtil<MesDailyEfficiencyVo> util = new ExcelUtil<MesDailyEfficiencyVo>(MesDailyEfficiencyVo. class);
util.exportExcel(response, list, "生产日效率报表"); // util.exportExcel(response, list, "生产日效率报表");
} }

9
op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java
Unescape Escape View File

@ -212,6 +212,15 @@ public class MesReportWork extends BaseEntity {
private String version; private String version;
private String sapCode; private String sapCode;
private String remark; private String remark;
private String checkResult;
public String getCheckResult() {
return checkResult;
}
public void setCheckResult(String checkResult) {
this.checkResult = checkResult;
}
public String getShiftName() { public String getShiftName() {
return shiftName; return shiftName;

72
op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyEfficiencyVo.java
Unescape Escape View File

@ -60,15 +60,15 @@ private static final long serialVersionUID=1L;
@Excel(name = "产量达成率") @Excel(name = "产量达成率")
private String completeRate; private String completeRate;
//一线 //一线
@Excel(name = "标准工艺效率（PC/H）") @Excel(name = "一线标准工艺效率（PC/H）")
private String standEff; private String standEff;
@Excel(name = "标准用人") @Excel(name = "一线标准用人")
private String standMan; private String standMan;
@Excel(name = "实际用人") @Excel(name = "一线实际用人")
private String actMan; private String actMan;
@Excel(name = "产品标准工时") @Excel(name = "一线产品标准工时")
private String standHour; private String standHour;
@Excel(name = "产品实际工时") @Excel(name = "一线产品实际工时")
private String actHour; private String actHour;
@Excel(name = "一线工时合计") @Excel(name = "一线工时合计")
private String oneHourSum; private String oneHourSum;
@ -76,75 +76,75 @@ private static final long serialVersionUID=1L;
private String oneStandEff; private String oneStandEff;
@Excel(name = "一线实际效率") @Excel(name = "一线实际效率")
private String oneActEff; private String oneActEff;
@Excel(name = "效率达成率") @Excel(name = "一线效率达成率")
private String effRate; private String effRate;
//辅助 //辅助
////辅助用人数 ////辅助用人数
@Excel(name = "辅助用人合计") @Excel(name = "辅助用人合计")
private String assisManSum; private String assisManSum;
@Excel(name = "班长人数") @Excel(name = "辅助班长人数")
private String monitorQty; private String monitorQty;
@Excel(name = "组长人数") @Excel(name = "辅助组长人数")
private String groupleaderQty; private String groupleaderQty;
@Excel(name = "机操工人数") @Excel(name = "辅助机操工人数")
private String operateMachineQty; private String operateMachineQty;
@Excel(name = "物料员人数") @Excel(name = "辅助物料员人数")
private String materialQty; private String materialQty;
@Excel(name = "配料员人数") @Excel(name = "辅助配料员人数")
private String materialDisQty; private String materialDisQty;
@Excel(name = "配药员人数") @Excel(name = "辅助配药员人数")
private String pillDisQty; private String pillDisQty;
@Excel(name = "药管员人数") @Excel(name = "辅助药管员人数")
private String pillMgrQty; private String pillMgrQty;
@Excel(name = "锅炉工人数") @Excel(name = "辅助锅炉工人数")
private String boilerQty; private String boilerQty;
@Excel(name = "石油气看管员人数") @Excel(name = "辅助石油气看管员人数")
private String oilQty; private String oilQty;
@Excel(name = "库区管理员人数") @Excel(name = "辅助库区管理员人数")
private String wareMgrQty; private String wareMgrQty;
@Excel(name = "机修工人数") @Excel(name = "辅助机修工人数")
private String repairQty; private String repairQty;
@Excel(name = "清洁工人数") @Excel(name = "辅助清洁工人数")
private String cleanerQty; private String cleanerQty;
////辅助工时数 ////辅助工时数
@Excel(name = "辅助工时合计") @Excel(name = "辅助工时合计")
private String assisHourSum; private String assisHourSum;
@Excel(name = "班长工时") @Excel(name = "辅助班长工时")
private String monitorHour; private String monitorHour;
@Excel(name = "组长工时") @Excel(name = "辅助组长工时")
private String groupleaderHour; private String groupleaderHour;
@Excel(name = "机操工工时") @Excel(name = "辅助机操工工时")
private String operateMachineHour; private String operateMachineHour;
@Excel(name = "物料员工时") @Excel(name = "辅助物料员工时")
private String materialHour; private String materialHour;
@Excel(name = "配料员工时") @Excel(name = "辅助配料员工时")
private String materialDisHour; private String materialDisHour;
@Excel(name = "配药员工时") @Excel(name = "辅助配药员工时")
private String pillDisHour; private String pillDisHour;
@Excel(name = "药管员工时") @Excel(name = "辅助药管员工时")
private String pillMgrHour; private String pillMgrHour;
@Excel(name = "锅炉工工时") @Excel(name = "辅助锅炉工工时")
private String boilerHour; private String boilerHour;
@Excel(name = "石油气看管员工时") @Excel(name = "辅助石油气看管员工时")
private String oilHour; private String oilHour;
@Excel(name = "库区管理员工时") @Excel(name = "辅助库区管理员工时")
private String wareMgrHour; private String wareMgrHour;
@Excel(name = "机修工工时") @Excel(name = "辅助机修工工时")
private String repairHour; private String repairHour;
@Excel(name = "清洁工工时") @Excel(name = "辅助清洁工工时")
private String cleanerHour; private String cleanerHour;
//一线+辅助 //一线+辅助
@Excel(name = "总工时") @Excel(name = "一线+辅助总工时")
private String hourSum; private String hourSum;
@Excel(name = "效率提升基数") @Excel(name = "一线+辅助效率提升基数")
private String effUpBase; private String effUpBase;
@Excel(name = "提升目标") @Excel(name = "一线+辅助提升目标")
private String upGoal; private String upGoal;
@Excel(name = "目标效率") @Excel(name = "一线+辅助目标效率")
private String goalRate; private String goalRate;
@Excel(name = "实际效率") @Excel(name = "一线+辅助实际效率")
private String actRate; private String actRate;
@Excel(name = "效率提升率") @Excel(name = "一线+辅助效率提升率")
private String effUpRate; private String effUpRate;
@Excel(name = "原因分析") @Excel(name = "原因分析")
private String reasonAnalysis; private String reasonAnalysis;

67
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineAssistantQtyServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.op.mes.service.impl;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.CollectionUtils;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
@ -148,59 +149,67 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
hours = hours==null?BigDecimal.ZERO:hours; hours = hours==null?BigDecimal.ZERO:hours;
assistdto.setProductHour(hours.toString()); assistdto.setProductHour(hours.toString());
allProHours = allProHours.add(hours); allProHours = allProHours.add(hours);
}
for(MesLineAssistantQtyVo assistdto:dtos){
//工时占比
assistdto.setHourRatio(new BigDecimal(assistdto.getProductHour())
.multiply(new BigDecimal("100.00"))
.divide(allProHours,2,BigDecimal.ROUND_HALF_UP)
.toString()+"%"
);
if(!assistMaps.isEmpty()){ if(!assistMaps.isEmpty()){
MesLineAssistantQty manQty = assistMaps.get(mesLineAssistant.getProductDateStr()); MesLineAssistantQty manQty = assistMaps.get(mesLineAssistant.getProductDateStr());
if(manQty!=null){ if(manQty!=null){
//班长用人=当日人数/线体数 //班长用人=当日人数*工时占比
assistdto.setMonitorQty(new BigDecimal(manQty.getMonitorQty()) assistdto.setMonitorQty(new BigDecimal(manQty.getMonitorQty())
.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.toString() .toString()
); );
//班长工时=当日考勤小时数/线体数 //班长工时=当日考勤小时数*工时占比
assistdto.setMonitorHour( assistdto.setMonitorHour(
monitorHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString()); monitorHour.multiply(
//组长用人=当日人数/线体数 new BigDecimal(assistdto.getHourRatio().replace("%",""))).toString());
//组长用人=当日人数*工时占比
assistdto.setGroupleaderQty(new BigDecimal(manQty.getGroupleaderQty()) assistdto.setGroupleaderQty(new BigDecimal(manQty.getGroupleaderQty())
.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.toString() .toString()
); );
//组长工时=当日考勤小时数/线体数 //组长工时=当日考勤小时数*工时占比
assistdto.setGroupLeaderHour( assistdto.setGroupLeaderHour(
groupleadeHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString()); groupleadeHour.multiply(
//物料员用人=当日人数/线体数 new BigDecimal(assistdto.getHourRatio().replace("%",""))).toString());
//物料员用人=当日人数*工时占比
assistdto.setMaterialQty(new BigDecimal(manQty.getMaterialQty()) assistdto.setMaterialQty(new BigDecimal(manQty.getMaterialQty())
.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.toString() .toString()
); );
//物料员工时=当日考勤小时数/线体数 //物料员工时=当日考勤小时数*工时占比
assistdto.setMaterialHour( assistdto.setMaterialHour(
materialHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString()); materialHour.multiply(
//药管员用人=当日人数/线体数 new BigDecimal(assistdto.getHourRatio().replace("%",""))).toString());
//药管员用人=当日人数*工时占比
assistdto.setPillMgrQty(new BigDecimal(manQty.getPillMgrQty()) assistdto.setPillMgrQty(new BigDecimal(manQty.getPillMgrQty())
.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.toString() .toString()
); );
//药管员工时=当日考勤小时数/线体数 //药管员工时=当日考勤小时数*工时占比
assistdto.setPillMgrHour( assistdto.setPillMgrHour(
pillMgrHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString()); pillMgrHour.multiply(new BigDecimal(assistdto.getHourRatio().replace("%",""))).toString());
//配药员用人=当日人数/线体数 //配药员用人=当日人数*工时占比
assistdto.setPillDisQty(new BigDecimal(manQty.getPillDisQty()) assistdto.setPillDisQty(new BigDecimal(manQty.getPillDisQty())
.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.toString() .toString()
); );
//配药员工时=当日考勤小时数/线体数 //配药员工时=当日考勤小时数/线体数
assistdto.setPillDisHour( assistdto.setPillDisHour(
pillDisHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString()); pillDisHour.multiply(
new BigDecimal(assistdto.getHourRatio().replace("%",""))).toString());
} }
} }
} }
for(MesLineAssistantQtyVo assistdto:dtos){ for(MesLineAssistantQtyVo assistdto:dtos){
//工时占比
assistdto.setHourRatio(new BigDecimal(assistdto.getProductHour())
.multiply(new BigDecimal("100.00"))
.divide(allProHours,2,BigDecimal.ROUND_HALF_UP)
.toString()+"%"
);
//辅助工时合计 //辅助工时合计
assistdto.setMonitorHour(StringUtils.isEmpty(assistdto.getMonitorHour())?"0":assistdto.getMonitorHour()); assistdto.setMonitorHour(StringUtils.isEmpty(assistdto.getMonitorHour())?"0":assistdto.getMonitorHour());
assistdto.setGroupLeaderHour(StringUtils.isEmpty(assistdto.getGroupLeaderHour())?"0":assistdto.getGroupLeaderHour()); assistdto.setGroupLeaderHour(StringUtils.isEmpty(assistdto.getGroupLeaderHour())?"0":assistdto.getGroupLeaderHour());
@ -240,6 +249,14 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
assistdto0.setPillDisQty(manQty.getPillDisQty().toString()); assistdto0.setPillDisQty(manQty.getPillDisQty().toString());
assistdto0.setPillDisHour(pillDisHour.toString()); assistdto0.setPillDisHour(pillDisHour.toString());
dtos.add(assistdto0); dtos.add(assistdto0);
if(StringUtils.isNotBlank(mesLineAssistant.getLineCode())){
dtos = dtos.stream().filter(dto ->(dto.getLineCode().equals(mesLineAssistant.getLineCode())))
.collect(Collectors.toList());
}
if(StringUtils.isNotBlank(mesLineAssistant.getLineCode())){
dtos = dtos.stream().filter(dto ->(dto.getLineCode().indexOf(mesLineAssistant.getProductName())>=0))
.collect(Collectors.toList());
}
return dtos; return dtos;
} }
/**生产日效率报表**/ /**生产日效率报表**/

1
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
Unescape Escape View File

@ -179,6 +179,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
pTabs.setTitle("第"+i+"层工单信息"); pTabs.setTitle("第"+i+"层工单信息");
mesReportWork.setParentOrder("0"); mesReportWork.setParentOrder("0");
List<MesReportWork> liblist0 = mesReportWorkMapper.getReportList(mesReportWork); List<MesReportWork> liblist0 = mesReportWorkMapper.getReportList(mesReportWork);
pTabs.setLibList(liblist0); pTabs.setLibList(liblist0);
pTabs.setRemark(liblist0.get(0).getRemark()); pTabs.setRemark(liblist0.get(0).getRemark());
tabs.add(pTabs); tabs.add(pTabs);

3
op-modules/op-mes/src/main/resources/mapper/mes/MesLineAssistantQtyMapper.xml
Unescape Escape View File

@ -97,12 +97,13 @@
<if test="carCode != null"> <if test="carCode != null">
and be.department like concat('%',#{carCode},'%') and be.department like concat('%',#{carCode},'%')
</if> </if>
<!--
<if test="lineCode != null"> <if test="lineCode != null">
and be.sap_code like concat('%',#{lineCode},'%') and be.sap_code like concat('%',#{lineCode},'%')
</if> </if>
<if test="productName != null"> <if test="productName != null">
and pow.product_name like concat('%',#{productName},'%') and pow.product_name like concat('%',#{productName},'%')
</if> </if>-->
and pow.workorder_name is not null and pow.status in('w3','w4') and pow.workorder_name is not null and pow.status in('w3','w4')
</select> </select>
<select id="getHoursByOrderCode" resultType="java.math.BigDecimal"> <select id="getHoursByOrderCode" resultType="java.math.BigDecimal">

7
op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
Unescape Escape View File

@ -662,9 +662,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pow.workorder_code_sap workorderCodeSap, pow.workorder_code_sap workorderCodeSap,
mrw.remark,mrw.report_code reportCode, mrw.remark,mrw.report_code reportCode,
mrw.machine_code machineCode, mrw.machine_code machineCode,
mrw.attr1,mrw.upload_status uploadStatus mrw.attr1,mrw.upload_status uploadStatus,
qct.check_result checkResult
from mes_report_work mrw from mes_report_work mrw
left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
left join qc_check_task qct on qct.check_type = 'checkTypeCPPC'
and qct.order_no = mrw.workorder_code
and mrw.batch = qct.income_batch_no
and qct.del_flag = '0'
where mrw.del_flag='0' and pow.del_flag = '0' where mrw.del_flag='0' and pow.del_flag = '0'
<if test='parentOrder=="0"'> <if test='parentOrder=="0"'>
and mrw.workorder_code = #{workorderCode} and mrw.workorder_code = #{workorderCode}

19
op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java
Unescape Escape View File

@ -55,6 +55,25 @@ public class QcInterface extends BaseEntity {
private String equipmentTypeCode; private String equipmentTypeCode;
private String checkType; private String checkType;
private String className;
private String defectSubclass;
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
public String getDefectSubclass() {
return defectSubclass;
}
public void setDefectSubclass(String defectSubclass) {
this.defectSubclass = defectSubclass;
}
public String getCheckType() { public String getCheckType() {
return checkType; return checkType;
} }

4
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java
Unescape Escape View File

@ -53,4 +53,8 @@ public interface QcInterfaceMapper {
QcInterface getProduceHz1(QcInterface qcInterface); QcInterface getProduceHz1(QcInterface qcInterface);
List<QcInterface> getCheckProjectsPieLL(QcInterface qcInterface); List<QcInterface> getCheckProjectsPieLL(QcInterface qcInterface);
List<QcInterface> getProduceNoOkList1(QcInterface qcInterface);
List<QcInterface> getCheckProjectsPie1(QcInterface qcInterface);
} }

9
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
Unescape Escape View File

@ -95,7 +95,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
String nowYMD = DateUtils.getDate(); String nowYMD = DateUtils.getDate();
qcInterface.setYmd(nowYMD); qcInterface.setYmd(nowYMD);
List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface); List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPie1(qcInterface);
return dtos; return dtos;
} }
@ -233,9 +233,10 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
@Override @Override
public List<QcInterface> getProduceNoOkList(QcInterface qcInterface) { public List<QcInterface> getProduceNoOkList(QcInterface qcInterface) {
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode()); DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
String nowYMD = DateUtils.getDate(); // String nowYMD = DateUtils.getDate();
qcInterface.setYmd(nowYMD); // qcInterface.setYmd(nowYMD);
List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList(qcInterface); // List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList(qcInterface);
List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList1(qcInterface);
return dtos; return dtos;
} }

44
op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
Unescape Escape View File

@ -115,6 +115,28 @@
group by class_name group by class_name
</if> </if>
</select> </select>
<select id="getCheckProjectsPie1" resultType="com.op.quality.domain.QcInterface">
select sum(noOk_quality) quality,
class_name projectName
FROM(
select
qctd.noOk_quality,
qdtc.class_name
from qc_check_task qct
left join qc_check_task_defect qctd on qctd.belong_to = qct.record_id
left join qc_defect_type_class qdtc on qctd.class_id = qdtc.id
where qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2'
and (
CONVERT(varchar(10),qct.create_time, 120) >= SUBSTRING(#{productDateStart},0,11)
and
SUBSTRING(#{productDateEnd},0,11) >= CONVERT(varchar(10),qct.create_time, 120)
)
and qdtc.del_flag = '0' and qctd.del_flag = '0'
) t
group by class_name
</select>
<select id="getSupplierBadTOP5" resultType="com.op.quality.domain.QcInterface"> <select id="getSupplierBadTOP5" resultType="com.op.quality.domain.QcInterface">
select top 5 t.* from ( select top 5 t.* from (
select t0.noOkQuality*100/t0.batchs quality,t0.supplierName from( select t0.noOkQuality*100/t0.batchs quality,t0.supplierName from(
@ -369,4 +391,26 @@
group by class_name group by class_name
</if> </if>
</select> </select>
<select id="getProduceNoOkList1" resultType="com.op.quality.domain.QcInterface">
select qctd.rule_name projectName,
qct.check_man_name checkManName,
qctd.update_time checkTime,
qc.check_name checkName,
qdtc.class_name className,
qdt.defect_subclass defectSubclass
from qc_check_task_detail qctd
left join qc_check_task qct on qctd.belong_to = qct.record_id
left join qc_check_type qc on qc.order_code = qct.check_type and qc.del_flag = '0'
left join qc_defect_type_class qdtc on qdtc.id = qct.remark_code
left join qc_defect_type qdt on qdt.defect_id = qdtc.defect_id
where qct.type_code = #{typeCode} and qctd.status = 'N'
and (
CONVERT(varchar(10),qct.income_time, 120) >= SUBSTRING(#{productDateStart},0,11)
and
SUBSTRING(#{productDateEnd},0,11) >= CONVERT(varchar(10),qct.income_time, 120)
)
order by qctd.update_time desc
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save