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

Merge remote-tracking branch 'origin/master'

Browse Source
master
yangwl 2 years ago
parent 377b6c3c9f 9c0a227e7d
commit 16a2ffa2e5
4 changed files with 96 additions and 78 deletions
Show Stats Download Patch File Download Diff File

21
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.foreverwin.mesnac.anomaly.controller;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
import com.foreverwin.mesnac.common.util.DataUtils;
import com.foreverwin.mesnac.common.util.DateUtil;
import com.foreverwin.mesnac.common.util.HttpUtils;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
@ -153,6 +156,24 @@ public class TemporaryFixController {
return R.ok(result);
}
/**
* 测试
* @param paramMap
* @return
*/
@PostMapping("/getURL")
@ResponseBody
public R getURL(Map paramMap) {
paramMap.put("materialCode","A10000");
String respBody = null;
try {
String jsonStr = JSONUtil.toJsonStr(paramMap);
respBody = HttpUtil.post("http://121.36.58.109:6088/hand/instore/info?materialCode=A10000", jsonStr);
} catch (Exception e) {
return R.failed(e.toString());
}
return R.ok(respBody);
}
/*
@PostMapping("/import")

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

@ -1334,21 +1334,21 @@ public class ReportServiceImpl implements ReportService {
tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork")));
totalWorkingHours += Float.valueOf(String.valueOf(map.get("totalWorkingHours")));
}
countMap.put("tardinessWork",String.format("%.3f",tardinessWork));
countMap.put("monthCapacity",String.format("%.3f",monthCapacity));
countMap.put("workHours1",String.format("%.3f",workHours1));
countMap.put("workHours2",String.format("%.3f",workHours2));
countMap.put("workHours3",String.format("%.3f",workHours3));
countMap.put("workHours4",String.format("%.3f",workHours4));
countMap.put("workHours5",String.format("%.3f",workHours5));
countMap.put("workHours6",String.format("%.3f",workHours6));
countMap.put("workHours7",String.format("%.3f",workHours7));
countMap.put("workHours8",String.format("%.3f",workHours8));
countMap.put("workHours9",String.format("%.3f",workHours9));
countMap.put("workHours10",String.format("%.3f",workHours10));
countMap.put("workHours11",String.format("%.3f",workHours11));
countMap.put("workHours12",String.format("%.3f",workHours12));
countMap.put("totalWorkingHours",String.format("%.3f",totalWorkingHours));
countMap.put("tardinessWork",String.format("%.2f",tardinessWork));
countMap.put("monthCapacity",String.format("%.2f",monthCapacity));
countMap.put("workHours1",String.format("%.2f",workHours1));
countMap.put("workHours2",String.format("%.2f",workHours2));
countMap.put("workHours3",String.format("%.2f",workHours3));
countMap.put("workHours4",String.format("%.2f",workHours4));
countMap.put("workHours5",String.format("%.2f",workHours5));
countMap.put("workHours6",String.format("%.2f",workHours6));
countMap.put("workHours7",String.format("%.2f",workHours7));
countMap.put("workHours8",String.format("%.2f",workHours8));
countMap.put("workHours9",String.format("%.2f",workHours9));
countMap.put("workHours10",String.format("%.2f",workHours10));
countMap.put("workHours11",String.format("%.2f",workHours11));
countMap.put("workHours12",String.format("%.2f",workHours12));
countMap.put("totalWorkingHours",String.format("%.2f",totalWorkingHours));
result.add(countMap);
return result;
}
@ -1402,20 +1402,20 @@ public class ReportServiceImpl implements ReportService {
tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork")));
totalWorkingHours += Float.valueOf(String.valueOf(map.get("totalWorkingHours")));
}
countMap.put("tardinessWork",String.format("%.3f",tardinessWork));
countMap.put("workHours1",String.format("%.3f",workHours1));
countMap.put("workHours2",String.format("%.3f",workHours2));
countMap.put("workHours3",String.format("%.3f",workHours3));
countMap.put("workHours4",String.format("%.3f",workHours4));
countMap.put("workHours5",String.format("%.3f",workHours5));
countMap.put("workHours6",String.format("%.3f",workHours6));
countMap.put("workHours7",String.format("%.3f",workHours7));
countMap.put("workHours8",String.format("%.3f",workHours8));
countMap.put("workHours9",String.format("%.3f",workHours9));
countMap.put("workHours10",String.format("%.3f",workHours10));
countMap.put("workHours11",String.format("%.3f",workHours11));
countMap.put("workHours12",String.format("%.3f",workHours12));
countMap.put("totalWorkingHours",String.format("%.3f",totalWorkingHours));
countMap.put("tardinessWork",String.format("%.2f",tardinessWork));
countMap.put("workHours1",String.format("%.2f",workHours1));
countMap.put("workHours2",String.format("%.2f",workHours2));
countMap.put("workHours3",String.format("%.2f",workHours3));
countMap.put("workHours4",String.format("%.2f",workHours4));
countMap.put("workHours5",String.format("%.2f",workHours5));
countMap.put("workHours6",String.format("%.2f",workHours6));
countMap.put("workHours7",String.format("%.2f",workHours7));
countMap.put("workHours8",String.format("%.2f",workHours8));
countMap.put("workHours9",String.format("%.2f",workHours9));
countMap.put("workHours10",String.format("%.2f",workHours10));
countMap.put("workHours11",String.format("%.2f",workHours11));
countMap.put("workHours12",String.format("%.2f",workHours12));
countMap.put("totalWorkingHours",String.format("%.2f",totalWorkingHours));
result.add(countMap);
return result;
}

2
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -1055,7 +1055,7 @@
</if>
<if test="abnormalBill.productionCategory != null and abnormalBill.productionCategory != ''">
AND zab.PRODUCT_CATEGORY LIKE '%${abnormalBill.productionCategory}'
AND zab.PRODUCT_CATEGORY = #{abnormalBill.productionCategory}
</if>
<if test="abnormalBill.itemDescription !=null and abnormalBill.itemDescription!=''">

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

@ -2576,20 +2576,20 @@ SELECT zab.CREATED_DATE_TIME,
--客户维度已完工工时报表
SELECT KHW."workCenterDescription",--车间
KHW."shortHandWorkOrder",--客户
SUM(KHW."tardinessWork") "tardinessWork", --未完工工时
SUM(KHW."workHours1") "workHours1",
SUM(KHW."workHours2") "workHours2",
SUM(KHW."workHours3") "workHours3",
SUM(KHW."workHours4") "workHours4",
SUM(KHW."workHours5") "workHours5",
SUM(KHW."workHours6") "workHours6",
SUM(KHW."workHours7") "workHours7",
SUM(KHW."workHours8") "workHours8",
SUM(KHW."workHours9") "workHours9",
SUM(KHW."workHours10") "workHours10",
SUM(KHW."workHours11") "workHours11",
SUM(KHW."workHours12") "workHours12",
SUM(KHW."totalWorkingHours") "totalWorkingHours"
ROUND(SUM(KHW."tardinessWork") ,2) "tardinessWork", --未完工工时
ROUND(SUM(KHW."workHours1") ,2) "workHours1",
ROUND(SUM(KHW."workHours2") ,2) "workHours2",
ROUND(SUM(KHW."workHours3") ,2) "workHours3",
ROUND(SUM(KHW."workHours4") ,2) "workHours4",
ROUND(SUM(KHW."workHours5") ,2) "workHours5",
ROUND(SUM(KHW."workHours6") ,2) "workHours6",
ROUND(SUM(KHW."workHours7") ,2) "workHours7",
ROUND(SUM(KHW."workHours8") ,2) "workHours8",
ROUND(SUM(KHW."workHours9") ,2) "workHours9",
ROUND(SUM(KHW."workHours10") ,2) "workHours10",
ROUND(SUM(KHW."workHours11") ,2) "workHours11",
ROUND(SUM(KHW."workHours12") ,2) "workHours12",
ROUND(SUM(KHW."totalWorkingHours"),2) "totalWorkingHours"
FROM (
SELECT CASE
WHEN INSTR(WIP."workOrder", '硫化') > 0 THEN '硫化'
@ -2626,84 +2626,84 @@ SELECT zab.CREATED_DATE_TIME,
FROM DUAL)
SELECT WCT.DESCRIPTION "workCenterDescription",
cf2.VALUE "workOrder",
SUM(CASE
ROUND(SUM(CASE
WHEN 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
ELSE 0 END),2) "tardinessWork",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month0) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt;
TO_DATE(MONTH.month1)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours1",
SUM(CASE
ELSE 0 END),2) "workHours1",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month1) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month2)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours2",
SUM(CASE
ELSE 0 END),2) "workHours2",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month2) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month3)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours3",
SUM(CASE
ELSE 0 END),2) "workHours3",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month3) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month4)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours4",
SUM(CASE
ELSE 0 END),2) "workHours4",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month4) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month5)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours5",
SUM(CASE
ELSE 0 END),2) "workHours5",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month5) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month6)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours6",
SUM(CASE
ELSE 0 END),2) "workHours6",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month6) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month7)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours7",
SUM(CASE
ELSE 0 END),2) "workHours7",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month7) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month8)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours8",
SUM(CASE
ELSE 0 END),2) "workHours8",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month8) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month9)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours9",
SUM(CASE
ELSE 0 END),2) "workHours9",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month9) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month10)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours10",
SUM(CASE
ELSE 0 END),2) "workHours10",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month10) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month11)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours11",
SUM(CASE
ELSE 0 END),2) "workHours11",
ROUND(SUM(CASE
WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month11) AND
(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt; TO_DATE(MONTH.month12)
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END) "workHours12"
ELSE 0 END),2) "workHours12"
FROM Z_SFC_DISPATCH ZSD
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
@ -2717,7 +2717,7 @@ SELECT zab.CREATED_DATE_TIME,
GROUP BY WCT.DESCRIPTION, cf2.VALUE) WIP
) KHW
GROUP BY KHW."workCenterDescription", KHW."shortHandWorkOrder"
ORDER BY KHW."workCenterDescription" DESC, KHW."shortHandWorkOrder"
ORDER BY "totalWorkingHours" DESC
</select>
<select id="workingHoursEachWorkshop" resultType="java.util.Map" parameterType="java.util.HashMap">
-- 工时看板(各车间总工时完成情况)
@ -2728,7 +2728,7 @@ SELECT zab.CREATED_DATE_TIME,
SELECT WCT.DESCRIPTION WORK_CENTER,
M_MONTH.MONTH,
SUM(ROUND(CASE
WHEN M_MONTH.MONTH = TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE, 'yyyy-mm') THEN
WHEN M_MONTH.MONTH = TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE + 8/24, 'yyyy-mm') THEN
ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END, 2)) QTY
FROM Z_SFC_DISPATCH ZSD
@ -2772,12 +2772,9 @@ SELECT zab.CREATED_DATE_TIME,
SELECT Vie.* FROM customer_Dimension_FinishedTime_Report Vie
</select>
<select id="getCapacityLoadUNPlanHours" resultType="java.util.Map">
SELECT CEIL(SUM(CASE
WHEN ZSD.DISPATCH_STATUS != 'COMPLETE'
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
WHEN ZSD.DISPATCH_STATUS != 'CANCEL'
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END)) "tardinessWork"
SELECT CEIL(SUM(CASE WHEN ZSD.DISPATCH_STATUS NOT IN ('COMPLETE','CANCEL')
THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
ELSE 0 END)) "tardinessWork"
FROM Z_SFC_DISPATCH ZSD
</select>

Write Preview
Loading…
Cancel
Save