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

更改四车间看板计划完成数sql,饼图sql.

Browse Source
master
yangwl 3 years ago
parent c433ff6b92
commit 7c9c36de39
4 changed files with 242 additions and 243 deletions
Show Stats Download Patch File Download Diff File

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

@ -40,6 +40,57 @@
</select>
<select id="partsManufacturing" parameterType="java.util.HashMap" resultType="java.util.HashMap">
WITH ZSD AS (
SELECT * FROM
( SELECT TEMP.* , ROW_NUMBER() OVER(PARTITION BY TEMP.FINISHED_SFC , TEMP.FINISHED_SHOP_ORDER ORDER BY STEP_ID_A) RN FROM
(
SELECT
cf.VALUE FINISHED_WORK_ORDER,
so.SHOP_ORDER FINISHED_SHOP_ORDER,
zsd.SFC FINISHED_SFC,
i.ITEM FINISHED_ITEM,
it.DESCRIPTION FINISHED_ITEM_DESCRIPTION,
o.OPERATION FINISHED_OPERATION,
ot.DESCRIPTION FINISHED_OPERATION_DESCRIPTION,
so.BOM_BO ,
zsd.SITE,
zsd.DISPATCH_STATUS FINISHED_STATUS,
ZSD.STEP_ID STEP_ID_A
FROM
Z_SFC_DISPATCH zsd
INNER JOIN SHOP_ORDER so ON
so.SHOP_ORDER = zsd.SHOP_ORDER
AND so.SITE = zsd.SITE
INNER JOIN ITEM i ON
i.HANDLE = so.ITEM_BO
LEFT JOIN ITEM_T it ON
it.ITEM_BO = i.HANDLE
AND it.LOCALE = 'zh'
INNER JOIN OPERATION o ON
o.OPERATION = zsd.OPERATION
AND o.SITE = zsd.SITE
AND o.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T ot ON
ot.OPERATION_BO = o.HANDLE
INNER JOIN CUSTOM_FIELDS cf ON
cf.HANDLE = so.HANDLE
AND cf."ATTRIBUTE" = 'WORK_ORDER'
WHERE
zsd.OPERATION IN ('HJ_6106HJH1', 'HJ_6106HJH2', 'HJ_6106HJH3')
AND cf.VALUE = #{workOrder}
AND zsd.SITE = #{site}
) TEMP
) WHERE RN = 1
) ,
zsdTemplate AS (
SELECT COUNT(ZSD2.SHOP_ORDER) NUM , ZSD.FINISHED_SHOP_ORDER FINISHED_SHOP_ORDER_TEMP , ZSD.FINISHED_SFC FINISHED_SFC_TEMP FROM ZSD
INNER JOIN BOM_COMPONENT bc ON bc.BOM_BO = zsd.BOM_BO
INNER JOIN SHOP_ORDER so ON so.ITEM_BO = BC.COMPONENT_GBO
INNER JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'WORK_ORDER' AND cf.VALUE = zsd.FINISHED_WORK_ORDER
INNER JOIN Z_SFC_DISPATCH zsd2 ON zsd2.SHOP_ORDER = so.SHOP_ORDER AND zsd2.SITE = #{site}
WHERE zsd2.DISPATCH_STATUS != 'COMPLETE' AND zsd2.DISPATCH_STATUS != 'CANCEL'
GROUP BY ZSD.FINISHED_SHOP_ORDER , ZSD.FINISHED_SFC
)
SELECT
DISTINCT
SITE,
@ -122,65 +173,9 @@
zsd2.ACTUAL_COMPLETE_DATE,
zsd2.STEP_ID
FROM
(
SELECT
cf.VALUE FINISHED_WORK_ORDER,
so.SHOP_ORDER FINISHED_SHOP_ORDER,
zsd.SFC FINISHED_SFC,
i.ITEM FINISHED_ITEM,
it.DESCRIPTION FINISHED_ITEM_DESCRIPTION,
o.OPERATION FINISHED_OPERATION,
ot.DESCRIPTION FINISHED_OPERATION_DESCRIPTION,
so.BOM_BO ,
zsd.SITE,
zsd.DISPATCH_STATUS FINISHED_STATUS
FROM
Z_SFC_DISPATCH zsd
INNER JOIN SHOP_ORDER so ON
so.SHOP_ORDER = zsd.SHOP_ORDER
AND so.SITE = zsd.SITE
INNER JOIN ITEM i ON
i.HANDLE = so.ITEM_BO
LEFT JOIN ITEM_T it ON
it.ITEM_BO = i.HANDLE
AND it.LOCALE = 'zh'
INNER JOIN OPERATION o ON
o.OPERATION = zsd.OPERATION
AND o.SITE = zsd.SITE
AND o.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T ot ON
ot.OPERATION_BO = o.HANDLE
INNER JOIN CUSTOM_FIELDS cf ON
cf.HANDLE = so.HANDLE
AND cf."ATTRIBUTE" = 'WORK_ORDER'
WHERE
zsd.OPERATION IN ('HJ_6106HJH1', 'HJ_6106HJH2', 'HJ_6106HJH3')
AND cf.VALUE = #{workOrder}
AND zsd.SITE = #{site}
)zsd
INNER JOIN (
SELECT
COUNT(zsd.HANDLE) NUM,
cf.VALUE WORK_ORDER ,
zsd.SITE
FROM
Z_SFC_DISPATCH zsd
INNER JOIN SHOP_ORDER so ON
so.SHOP_ORDER = zsd.SHOP_ORDER
AND so.SITE = zsd.SITE
INNER JOIN CUSTOM_FIELDS cf ON
cf.HANDLE = so.HANDLE
AND cf."ATTRIBUTE" = 'WORK_ORDER'
WHERE
zsd.DISPATCH_STATUS != 'COMPLETE'
AND zsd.DISPATCH_STATUS != 'CANCEL'
AND cf.VALUE = #{workOrder}
GROUP BY
cf.VALUE,
zsd.SITE
) zsdTemplate ON
zsdTemplate.WORK_ORDER = zsd.FINISHED_WORK_ORDER
AND zsdTemplate.SITE = zsd.SITE
zsd
INNER JOIN zsdTemplate ON
zsdTemplate.FINISHED_SHOP_ORDER_TEMP = zsd.FINISHED_SHOP_ORDER AND zsdTemplate.FINISHED_SFC_TEMP = ZSD.FINISHED_SFC
INNER JOIN BOM_COMPONENT bc ON
bc.BOM_BO = zsd.BOM_BO
INNER JOIN ITEM i ON
@ -271,9 +266,9 @@
OR OPERATION_DESCRIPTION LIKE '%${operation}%'
)
</if>
<!-- <if test="finishedStatus != null and finishedStatus != ''">-->
<!-- AND FINISHED_STATUS = #{finishedStatus}-->
<!-- </if>-->
<!-- <if test="finishedStatus != null and finishedStatus != ''">-->
<!-- AND FINISHED_STATUS = #{finishedStatus}-->
<!-- </if>-->
<if test="startDateTime != null and startDateTime != ''">
AND ACTUAL_START_DATE &gt;= TO_DATE(#{startDateTime}, 'YYYY-MM-DD') - 8/24
</if>
@ -291,7 +286,7 @@
AND FINISHED_STATUS = #{hjIsCompleted}
</if>
<if test="isCompleted != null and isCompleted != ''">
AND IS_COMPLETE = #{isCompleted}
AND HJ_IS_COMPLETE = #{isCompleted}
</if>
</where>
ORDER BY FINISHED_OPERATION,FINISHED_SHOP_ORDER,SFC,STEP_ID

2
common/src/main/resources/mapper/BoardMapper.xml
Unescape Escape View File

@ -567,7 +567,7 @@
<!--异常看板-->
<select id="abnormalTypeQty" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT TEMP.* , NVL(T.DID_CNT,0) ,NVL(T.SUM_CNT,0) SUM_CNT FROM
SELECT TEMP.* , NVL(T.DID_CNT,0) DID_CNT,NVL(T.SUM_CNT,0) SUM_CNT FROM
( SELECT 'Z' TYPE , '质量异常' TYPE_DESCRIPTION FROM DUAL
UNION
SELECT 'Q' TYPE , '其他异常' TYPE_DESCRIPTION FROM DUAL

8
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
Unescape Escape View File

@ -3,12 +3,17 @@ package com.foreverwin.mesnac.dispatch.controller;
import cn.hutool.core.date.DateUtil;
import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
import com.foreverwin.mesnac.dispatch.service.ShopOrderReleaseService;
import com.foreverwin.mesnac.dispatch.service.impl.ShopOrderReleaseServiceImpl;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.R;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
@ -31,11 +36,11 @@ public class ShopOrderReleaseController {
@Autowired
private ShopOrderReleaseService shopOrderReleaseService;
@ResponseBody
@PostMapping("queryShopOrder")
public R queryShopOrder(@RequestBody ShopOrderRelease shopOrderRelease) {
List<ShopOrderRelease> list = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
if (shopOrderRelease == null) {
shopOrderRelease = new ShopOrderRelease();
@ -54,7 +59,6 @@ public class ShopOrderReleaseController {
if (shopOrderRelease.getCompleteToDate_S() != null) {
shopOrderRelease.setCompleteToDate(DateUtil.parse(shopOrderRelease.getCompleteToDate_S()));
}
list = shopOrderReleaseService.findShopOrderList(shopOrderRelease);
} catch (Exception e) {
return R.failed(e.getMessage());

2
dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
Unescape Escape View File

@ -36,7 +36,7 @@
INNER JOIN STATUS ST ON SO.STATUS_BO = ST.HANDLE AND ST.STATUS_GROUP = 'ORDERS'
INNER JOIN ROUTER RT ON SO.PLANNED_ROUTER_BO = RT.HANDLE OR (SO.PLANNED_ROUTER_BO = 'RouterBO:'||RT.SITE||','||RT.ROUTER||','||RT.ROUTER_TYPE||',#' AND RT.CURRENT_REVISION = 'true')
INNER JOIN ROUTER_OPERATION RO ON RT.ENTRY_ROUTER_STEP_BO = RO.ROUTER_STEP_BO
INNER JOIN OPERATION OP ON SO.SITE = OP.SITE AND SPLIT(RO.OPERATION_BO,2) = OP.OPERATION AND OP.CURRENT_REVISION = 'true'
INNER JOIN OPERATION OP ON RO.OPERATION_BO = 'OperationBO:'||OP.SITE||','||OP.OPERATION||',#' AND OP.CURRENT_REVISION = 'true'
LEFT JOIN (
SELECT SHOP_ORDER_BO
FROM SFC SC

Write Preview
Loading…
Cancel
Save