|
|
|
|
@ -263,7 +263,8 @@
|
|
|
|
|
SELECT zab.CREATED_DATE_TIME,zab.ABNORMAL_NO ABNORMAL_NO,
|
|
|
|
|
dflt.DATA_TAG PRODUCT_CATEGORY,
|
|
|
|
|
dflt2.DATA_TAG DISCOVER,
|
|
|
|
|
i.ITEM ITEM ,it.DESCRIPTION ITEM_DESCRIPTION,itemNumber.VALUE ITEM_NUMBER,
|
|
|
|
|
i.ITEM ITEM ,it.DESCRIPTION ITEM_DESCRIPTION,
|
|
|
|
|
COALESCE(itemNumber.VALUE,zab.ITEM_NUMBER) ITEM_NUMBER,
|
|
|
|
|
mapNo.VALUE MAP_NO,zab.PB_DESCRIPTION PB_DESCRIPTION,zsd.EMPLOYEE_DESCRIPTION OPERATOR,
|
|
|
|
|
CASE WHEN zab."TYPE" = 'Z' THEN '质量异常'
|
|
|
|
|
WHEN zab."TYPE" = 'Q' THEN '其他异常'
|
|
|
|
|
@ -331,7 +332,7 @@
|
|
|
|
|
AND (wc.WORK_CENTER LIKE '%${workCenter}%' OR wct.DESCRIPTION LIKE '%${workCenter}%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="itemNumber != null and itemNumber != ''">
|
|
|
|
|
AND itemNumber.VALUE = #{itemNumber}
|
|
|
|
|
AND (CASE WHEN itemNumber.VALUE IS NOT NULL THEN itemNumber.VALUE ELSE zab.ITEM_NUMBER END) = #{itemNumber}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productCategory != null and productCategory != ''">
|
|
|
|
|
AND (dflt.DATA_TAG = #{productCategory} OR
|
|
|
|
|
@ -356,7 +357,7 @@
|
|
|
|
|
</if>
|
|
|
|
|
</where>
|
|
|
|
|
GROUP BY zab.CREATED_DATE_TIME ,zab.ABNORMAL_NO ,
|
|
|
|
|
i.ITEM ,it.DESCRIPTION ,itemNumber.VALUE ,
|
|
|
|
|
i.ITEM ,it.DESCRIPTION ,itemNumber.VALUE ,zab.ITEM_NUMBER,
|
|
|
|
|
mapNo.VALUE ,zab.PB_DESCRIPTION ,zsd.EMPLOYEE_DESCRIPTION ,
|
|
|
|
|
zab."TYPE" ,zab.REPORT_SEND_USER_GROUP ,zabd.DUTY_DEPART ,zabd.PRINCIPAL_USER,
|
|
|
|
|
zab.PB_GRADE,zabd.DUTY_CAUSE_DESCRIPTION ,zabd.BEFORE_MEASURE,ABNORMAL_METHOD,
|
|
|
|
|
@ -370,7 +371,10 @@
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="findAbnormalRecord" parameterType="java.util.HashMap" resultType="java.util.HashMap">
|
|
|
|
|
SELECT wct.DESCRIPTION WORK_CENTER,zab.ITEM_NUMBER ITEM_NUMBER,zab.PRODUCT_CATEGORY ,cf.VALUE WORK_ORDER,so.SHOP_ORDER SHOP_ORDER ,
|
|
|
|
|
SELECT wct.DESCRIPTION WORK_CENTER,
|
|
|
|
|
COALESCE(cf2.VALUE,zab.ITEM_NUMBER) ITEM_NUMBER,
|
|
|
|
|
COALESCE(zab.WORK_ORDER,cf.VALUE) WORK_ORDER,
|
|
|
|
|
so.SHOP_ORDER SHOP_ORDER ,
|
|
|
|
|
i.ITEM ITEM,it.DESCRIPTION ITEM_DESCRIPTION,zab.SFC SFC,zab.ABNORMAL_NO ABNORMAL_NO,
|
|
|
|
|
CASE WHEN zab."TYPE" = 'Z' THEN '质量异常'
|
|
|
|
|
WHEN zab."TYPE" = 'S' THEN '设备异常'
|
|
|
|
|
@ -413,6 +417,7 @@
|
|
|
|
|
LEFT JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nc.HANDLE AND nct.LOCALE = 'zh'
|
|
|
|
|
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'WORK_ORDER'
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'ITEM_NUMBER'
|
|
|
|
|
LEFT JOIN ITEM i ON i.HANDLE = zab.ITEM_BO
|
|
|
|
|
LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE AND it.LOCALE = 'zh'
|
|
|
|
|
LEFT JOIN OPERATION o ON o.OPERATION = zab.OPERATION AND o.SITE = zab.SITE
|
|
|
|
|
@ -430,10 +435,10 @@
|
|
|
|
|
AND (wc.WORK_CENTER = #{workCenter} OR wct.DESCRIPTION = #{workCenter})
|
|
|
|
|
</if>
|
|
|
|
|
<if test="itemNumber != null and itemNumber != ''">
|
|
|
|
|
AND zab.ITEM_NUMBER = #{itemNumber}
|
|
|
|
|
AND (CASE WHEN cf2.VALUE IS NOT NULL THEN cf2.VALUE ELSE zab.ITEM_NUMBER END) = #{itemNumber}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workOrder != null and workOrder != ''">
|
|
|
|
|
AND cf.VALUE = #{workOrder}
|
|
|
|
|
AND (CASE WHEN zab.WORK_ORDER IS NOT NULL THEN zab.WORK_ORDER ELSE cf2.VALUE END) = #{workOrder}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="operation != null and operation != ''">
|
|
|
|
|
AND (zab.OPERATION LIKE '%${operation}%'
|
|
|
|
|
@ -462,12 +467,13 @@
|
|
|
|
|
znu3.FULL_NAME,zabd.CLOSED_DATE_TIME ,znu4.FULL_NAME,
|
|
|
|
|
zabd.RESOLVE_REMARK,zabd.ABNORMAL_REASON,zabd.BEFORE_MEASURE,
|
|
|
|
|
zsr.CREATED_DATE_TIME,zab.ITEM_NUMBER,
|
|
|
|
|
zabd.DUTY_DEPART,ug.DESCRIPTION
|
|
|
|
|
zabd.DUTY_DEPART,ug.DESCRIPTION,cf2.VALUE,zab.WORK_ORDER
|
|
|
|
|
ORDER BY zab.CREATED_DATE_TIME DESC
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="shopOrderSchedule" parameterType="java.util.HashMap" resultType="java.util.HashMap">
|
|
|
|
|
SELECT wct.DESCRIPTION WORK_CENTER_DESCRIPTION,cf.VALUE ITEM_NUMBER,cf2.VALUE PRODUCT_CATEGORY,
|
|
|
|
|
SELECT wct.DESCRIPTION WORK_CENTER_DESCRIPTION,cf.VALUE ITEM_NUMBER,
|
|
|
|
|
COALESCE(dflt.DATA_TAG,cf2.VALUE) PRODUCT_CATEGORY,
|
|
|
|
|
zsd.SHOP_ORDER,it.DESCRIPTION ITEM_DESCRIPTION,zsd.PLANNED_START_DATE,
|
|
|
|
|
zsd.PLANNED_COMP_DATE ,zsd.ACTUAL_START_DATE ,ot.DESCRIPTION CURRENT_OPERATION_DESCRIPTION,
|
|
|
|
|
ot2.DESCRIPTION OPERATION_DESCRIPTION,
|
|
|
|
|
@ -502,6 +508,9 @@
|
|
|
|
|
LEFT JOIN ROUTER_STEP rs ON zsd.ROUTER_BO = rs.ROUTER_BO AND rs.STEP_ID = zsd.STEP_ID
|
|
|
|
|
LEFT JOIN ROUTER_OPERATION ro ON ro.ROUTER_STEP_BO = rs.HANDLE AND ro.OPERATION_BO = ss.OPERATION_BO
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS cf3 ON cf3.HANDLE = ro.HANDLE AND cf3."ATTRIBUTE" = 'PROD_TIME'
|
|
|
|
|
INNER JOIN DATA_FIELD df ON df.DATA_FIELD = 'PRODUCT_CATEGORY'
|
|
|
|
|
LEFT JOIN DATA_FIELD_LIST dfl ON dfl.DATA_FIELD_BO = df.HANDLE AND dfl.DATA_VALUE = zab.PRODUCT_CATEGORY
|
|
|
|
|
LEFT JOIN DATA_FIELD_LIST_T dflt ON dflt.DATA_FIELD_LIST_BO = dfl.HANDLE AND dflt.LOCALE = #{locale}
|
|
|
|
|
<where>
|
|
|
|
|
zsd.SITE = #{site}
|
|
|
|
|
<if test="workCenter != null and workCenter != ''">
|
|
|
|
|
@ -511,7 +520,10 @@
|
|
|
|
|
AND cf.VALUE = #{itemNumber}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productCategory != null and productCategory != ''">
|
|
|
|
|
AND cf2.VALUE = #{productCategory}
|
|
|
|
|
AND (dflt.DATA_TAG = #{productCategory} OR
|
|
|
|
|
zab.PRODUCT_CATEGORY = #{productCategory} OR
|
|
|
|
|
cf2.VALUE = #{productCategory}
|
|
|
|
|
)
|
|
|
|
|
</if>
|
|
|
|
|
<if test="shopOrder != null and shopOrder != ''">
|
|
|
|
|
AND so.SHOP_ORDER LIKE '%${shopOrder}%'
|
|
|
|
|
|
赵嘉伟
3 years ago