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

add已派工工单明细报表

Browse Source
master
yinq 2 years ago
parent 51a7308d34
commit 2e485943bc
5 changed files with 91 additions and 19 deletions
Show Stats Download Patch File Download Diff File

14
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
Unescape Escape View File

@ -428,6 +428,20 @@ public class ReportController {
}
}
/**
* 已派工工单明细报表
* @param paramMap
* @return
*/
@GetMapping("/assignedWorkersOrdersReport")
public R assignedWorkersOrdersReport(@RequestParam(required = false) Map paramMap){
try{
return R.ok(reportService.assignedWorkersOrdersReport(paramMap));
}catch (Exception e){
return R.failed(e.getMessage());
}
}
/**
* 项目生产加工周期看板
* @param

9
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
Unescape Escape View File

@ -199,9 +199,16 @@ public interface ReportMapper {
List<Map<String, Object>> lastOperationCompletedReport(Map paramMap);
/**
*
* 订单查询报表
* @param paramMap
* @return
*/
List<Map<String, Object>> orderQueryReportReport(Map paramMap);
/**
* 已派工工单明细报表
* @param paramMap
* @return
*/
List<Map<String, Object>> assignedWorkersOrdersReport(Map paramMap);
}

7
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
Unescape Escape View File

@ -216,4 +216,11 @@ public interface ReportService {
*/
List<Map<String, Object>> orderQueryReportReport(Map paramMap);
/**
* 已派工工单明细报表
* @param paramMap
* @return
*/
List<Map<String, Object>> assignedWorkersOrdersReport(Map paramMap);
}

20
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
Unescape Escape View File

@ -1067,13 +1067,14 @@ public class ReportServiceImpl implements ReportService {
//计划工时
ArrayList<Float> planList = new ArrayList<>();
planList.add(Float.valueOf(String.valueOf(map.get("tardinessWork"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity1"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity2"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity3"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity4"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity5"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity6"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity7"))));
planList.add(Float.valueOf(String.valueOf(map.get("planCapacity8"))));
// planList.add(Float.valueOf(String.valueOf(map.get("planCapacity8"))));
resourceMap.put("planCapacityList",planList);
//标准产能
resourceMap.put("standardWeekCapacity",map.get("standardWeekCapacity"));
@ -1102,8 +1103,8 @@ public class ReportServiceImpl implements ReportService {
planUndoneHoursList.add(Float.valueOf(String.valueOf(map.get("planUndoneHours"))));
eightList.add(resourceMap);
}
result.put("planCapacity",String.format("%.2f", planCapacity));
result.put("standardCapacity",String.format("%.2f", standardCapacity));
result.put("planCapacity",Math.round(planCapacity));
result.put("standardCapacity",Math.round(standardCapacity));
//八个柱状图
result.put("eightList",eightList);
//中心 计划工时、未完成工时List
@ -1252,6 +1253,19 @@ public class ReportServiceImpl implements ReportService {
return reportMapper.orderQueryReportReport(paramMap);
}
/**
* 已派工工单明细报表
* @param paramMap
* @return
*/
@Override
public List<Map<String, Object>> assignedWorkersOrdersReport(Map paramMap) {
String site = CommonMethods.getSite();
paramMap.put("site", site);
paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
return reportMapper.assignedWorkersOrdersReport(paramMap);
}
/**
* 事业部质量看板数据接口
* @param user

40
anomaly/src/main/resources/mapper/ReportMapper.xml
Unescape Escape View File

@ -1272,7 +1272,10 @@
zsd.PLANNED_COMP_DATE "planEndCompDate",--预计完工时间
zsd.REWORK_SUM "reworkSum",--返修工序数量
zsd.LAST_REWORK_SUM "lastReworkSum",--剩余返修工序数量
zsd.RATE || '%' "rate"--进度百分比（工时）
CASE
WHEN LAST_REWORK_SUM = 0 THEN '100.00'
ELSE zsd.rate
END || '%' "rate"--进度百分比（工时）
FROM Z_ABNORMAL_BILL zab
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
@ -1286,12 +1289,15 @@
ELSE 1 END) LAST_REWORK_SUM,
TO_CHAR(
DECODE(SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' THEN
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.DISPATCH_STATUS = 'CANCEL'
THEN
zsd.PROD_HOURS * zsd.DISPATCH_QTY
ELSE 0 END), 0, 0, SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' THEN
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.DISPATCH_STATUS = 'CANCEL'
THEN
zsd.PROD_HOURS * zsd.DISPATCH_QTY
ELSE 0 END) / SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY))
ELSE 0 END) /
SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY))
* 100, '99990.99') RATE --进度百分比
FROM Z_SFC_DISPATCH zsd
WHERE STEP_ID LIKE '90%'
@ -1362,6 +1368,7 @@
ORDER BY DATE_TIME DESC
</select>
<select id="projectScheduleShow" parameterType="java.util.HashMap" resultType="java.util.HashMap">
--事业部项目进度看板数据接口
SELECT * FROM (
SELECT OWIP.item "item",--项目号
OWIP.workOrder "workOrder",
@ -1968,7 +1975,7 @@
ELSE 9 END ASC) ROWW,
SUM(CASE
WHEN TO_DATE(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')) >
(ZSD.PLANNED_COMP_DATE + 8 / 24)
(ZSD.PLANNED_COMP_DATE + 8 / 24) AND ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND ZSD.DISPATCH_STATUS != 'COMPLETE'
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "tardinessWork",
SUM(CASE
@ -2440,5 +2447,28 @@
GROUP BY WIP.ITEM, WIP.ITEM_DESCRIPTION, WIP.ITEM_NUMBER, WIP.WORK_ORDER, WIP.SHOP_ORDER, WIP.BLANKING_SIZE
ORDER BY WIP.ITEM, WIP.ITEM_DESCRIPTION, WIP.ITEM_NUMBER, WIP.WORK_ORDER, WIP.SHOP_ORDER
</select>
<select id="assignedWorkersOrdersReport" resultType="java.util.Map">
SELECT * FROM assigned_Workers_Orders_Report_View V
WHERE 1=1
<if test="workOrder != null and workOrder != ''">
AND V.WORK_ORDER = #{workOrder}
</if>
<if test="shopOrder != null and shopOrder != ''">
AND V.SHOP_ORDER = #{shopOrder}
</if>
<if test="operationCode != null and operationCode != ''">
AND V.OPERATION = #{operationCode}
</if>
<if test="operationDescription != null and operationDescription != ''">
AND V.OPERATION_DESCRIPTION = #{operationDescription}
</if>
<if test="dispatchStatus != null and dispatchStatus != ''">
AND V.DISPATCH_STATUS = #{dispatchStatus}
</if>
<if test="workCenter != null and workCenter != ''">
AND V.WORK_CENTER_DESCRIPTION = #{workCenter}
</if>
</select>
</mapper>
Write Preview
Loading…
Cancel
Save