@ -64,9 +64,82 @@
FROM QA_INSPECTION_TASK ${ew.customSqlSegment} FROM QA_INSPECTION_TASK ${ew.customSqlSegment}
</select> </select>
<select id= "detailById"
resultType="org.springblade.desk.quality.pojo.vo.InspectionTaskListVO">
SELECT
CASE
WHEN ts.TS_NAME is not null THEN
ts.TS_NAME
WHEN oem.OC_NAME is not null THEN
oem.OC_NAME
ELSE
''
END AS mainProcessingUnit ,
--ts.TS_NAME,oem.OC_NAME,
yo.PRODUCT_TYPE as prodType,yo.PART_NAME as prodName,yo.PLATE as platingInfo,
yo.USE_DEPT as needDeptName,wo.batch_no as batchNo,wo.batch_no as poBatchNo,
ps.NAME as currentProcessName,ps01.NAME as nextProcessName,wo.MAKE_QTY as poQty,
yo.YP_AREA * wo.MAKE_QTY as areaTotal,yo.YP_AREA as area,yo.PRODUCT_IDENT as prodIdent,
t.*,wo.WO_CODE as woCode,
wo.PART_CODE AS partCode,
wo.PART_CODE AS prodCode,
wo.TEST_QTY as orderCheckQty,
wo.LOSS_QTY as orderLossQty,
wo.SCRAP_QTY as orderScrapQty,
wo.CARD_NO AS cardNo
FROM QA_INSPECTION_TASK t
-- 车间作业计划 wp
LEFT JOIN MES_WORK_PLAN wp ON t.WP_ID = wp.ID
-- 车间订单 wo
LEFT JOIN MES_WORK_ORDER wo ON wp.WO_ID = wo.ID
-- 生产订单 yo
LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
-- 工序
LEFT JOIN BS_PROCESS_SET ps ON wp.ORDERS = ps.CODE
LEFT JOIN BS_PROCESS_SET ps01 ON wp.NEXT_WP_ID = ps01.ID
-- LEFT JOIN DS_PROCESS ps ON wp.ORDERS = ps.PROCESS_CODE
-- 外协厂商 oem
LEFT JOIN BS_OEM oem ON wp.OC_ID = oem.ID
-- 班组 ts
LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID
-- 部门
LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID
WHERE (
t.IS_DELETED = 0 and t.ID = #{q.id}
-- AND wp.IS_DELETED = 0
-- AND wo.IS_DELETED = 0
-- AND ps.IS_DELETED = 0
-- AND oem.IS_DELETED = 0
-- AND bl_dept.IS_DELETED = 0
)
ORDER BY t.ID DESC
</select>
<select id= "listSearch" <select id= "listSearch"
resultType="org.springblade.desk.quality.pojo.vo.InspectionTaskListVO"> resultType="org.springblade.desk.quality.pojo.vo.InspectionTaskListVO">
SELECT t.*, SELECT
CASE
WHEN ts.TS_NAME is not null THEN
ts.TS_NAME
WHEN oem.OC_NAME is not null THEN
oem.OC_NAME
ELSE
''
END AS mainProcessingUnit ,
--ts.TS_NAME,oem.OC_NAME,
yo.USE_DEPT as needDeptName,wo.batch_no as batchNo,wo.batch_no as poBatchNo,
ps.NAME as currentProcessName,ps01.NAME as nextProcessName,yo.PRODUCT_IDENT as prodIdent,
yo.YP_AREA * wo.MAKE_QTY as areaTotal,yo.YP_AREA as area,wo.MAKE_QTY as poQty,
t.*,wo.WO_CODE as woCode,
wo.PART_CODE AS partCode, wo.PART_CODE AS partCode,
wo.CARD_NO AS cardNo wo.CARD_NO AS cardNo
FROM QA_INSPECTION_TASK t FROM QA_INSPECTION_TASK t
@ -77,11 +150,13 @@
-- 生产订单 yo -- 生产订单 yo
LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
-- 工序 -- 工序
LEFT JOIN DS_PROCESS ps ON wp.ORDERS = ps.PROCESS_CODE LEFT JOIN BS_PROCESS_SET ps ON wp.ORDERS = ps.CODE
LEFT JOIN BS_PROCESS_SET ps01 ON wp.NEXT_WP_ID = ps01.ID
-- LEFT JOIN DS_PROCESS ps ON wp.ORDERS = ps.PROCESS_CODE
-- 外协厂商 oem -- 外协厂商 oem
LEFT JOIN BS_OEM oem ON wp.OC_ID = oem.ID LEFT JOIN BS_OEM oem ON wp.OC_ID = oem.ID
-- 班组 ts -- 班组 ts
-- LEFT JOIN BA _TEAM_SET ts ON wp.MAKE_TEAM = ts.ID LEFT JOIN BS _TEAM_SET ts ON wp.MAKE_TEAM = ts.ID
-- 部门 -- 部门
LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID
WHERE ( WHERE (
@ -140,6 +215,10 @@
<if test= "q.prodIdent != null and q.prodIdent != ''" > <if test= "q.prodIdent != null and q.prodIdent != ''" >
AND yo.PRODUCT_IDENT = #{q.prodIdent} AND yo.PRODUCT_IDENT = #{q.prodIdent}
</if> </if>
<if test= "q.cardNo != null and q.cardNo != ''" >
AND wo.CARD_NO = #{cardNo}
</if>
-- ps -- ps
<if test= "q.currentProcessId != null" > <if test= "q.currentProcessId != null" >
AND ps.ID = #{q.currentProcessId} AND ps.ID = #{q.currentProcessId}
pangyang
1 month ago