负荷看板修改

master
yinq 2 years ago
parent 05509f9a3c
commit c291217871

@ -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")

@ -2621,7 +2621,7 @@ SELECT zab.CREATED_DATE_TIME,
FROM DUAL)
SELECT WCT.DESCRIPTION "workCenterDescription",
cf2.VALUE "workOrder",
ROUND(ROUND(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
@ -2712,7 +2712,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">
-- 工时看板(各车间总工时完成情况)
@ -2723,7 +2723,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

Loading…
Cancel
Save