diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index e8b4605..1ec92d4 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1905,12 +1905,12 @@ c.operationDesc, sum(roll_qty) as sjzs, --送检总数 work_center_no, - C.S_ResourceID as resourceId, + a.S_ResourceID as resourceId, D.ResourceDesc as resourceDesc FROM shoporder T INNER JOIN soscheduledrouting a ON a.site = t.site AND t.orderno = a.orderno INNER JOIN SORouting c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - INNER JOIN WorkCenterResource D ON C.Site = D.SITE AND C.WorkCenterNo = D.WorkCenterNo AND C.S_ResourceID = D.ResourceID + INNER JOIN WorkCenterResource D ON C.Site = D.SITE AND C.WorkCenterNo = D.WorkCenterNo AND a.S_ResourceID = D.ResourceID INNER JOIN part J ON t.site = J.site AND t.partNo = J.partNo left join qc_ipqc_record r on a.site = r.site and a.seqno = r.seq_no WHERE @@ -1936,7 +1936,7 @@ AND c.operationDesc LIKE '%' + #{query.operationDesc} + '%' - group by a.seqno, a.orderno, J.partNo, J.PartDescription, t.lotsize, a.QtyReported, c.operationDesc ,work_center_no ,PartType,C.S_ResourceID,D.ResourceDesc,C.ItemNo + group by a.seqno, a.orderno, J.partNo, J.PartDescription, t.lotsize, a.QtyReported, c.operationDesc ,work_center_no ,PartType,a.S_ResourceID,D.ResourceDesc,C.ItemNo