2024-10-23

优化

src/main/resources/mapper/pms/QcMapper.xml

@@ -1923,7 +1923,7 @@
         a.resource_id,
         dbo.qc_get_resource_desc(a.site, a.resource_id, a.work_center_no) as resourceDesc,
         a.part_no,
-        dbo.qc_get_part_desc(a.part_no) as part_desc,
+        p.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1935,7 +1935,7 @@
         a.ssr_id,
         a.unqualified_qty,
         a.submit_flag,
-        dbo.qc_get_spec(a.part_no) as spec,
+        p.spec,
         a.seq_no,
         a.batch_roll_no,
         a.special_requirements,
@@ -1972,7 +1972,7 @@
                 AND a.part_no LIKE #{query.partNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND dbo.qc_get_part_desc(a.part_no) LIKE #{query.partDesc}
+                AND p.PartDescription LIKE #{query.partDesc}
             </if>
             <if test = "query.states != null and query.states.size > 0">
                 AND a.state in
@@ -3358,14 +3358,16 @@
         p.DefaultDepartmentID as departmentID,
         d.DepartmentName,
         a.ScheduledDate,
-        a.OperatorName,
-        isnull(a.roll_qty, 0) as rollQty
+        a.CreatedBy as createBy,
+        isnull(a.roll_qty, 0) as rollQty,
+        u.UserName as OperatorName
         FROM SOScheduledRouting AS a
         inner join ShopOrder as t ON t.Site = a.Site AND t.OrderNo = a.SOOrderNo
         inner join WorkCenterResource as w ON w.Site = a.Site AND w.WorkCenterNo = a.S_WorkCenterNo and w.ResourceID = a.S_ResourceID
         left join part as p on a.site = p.site and a.partNo = p.partNo
         left join department as d on d.site = p.site and d.DepartmentID = p.DefaultDepartmentID
         left join WorkCenter as w2 on w2.Site = a.Site AND w2.WorkCenterNo = a.S_WorkCenterNo
+        left join users as u on a.site = u.site and a.CreatedBy = u.UserID
         WHERE
         a.site in (select site from eam_access_site where username = #{query.userName})
         <if test="query.cancelFlag == null or query.cancelFlag == ''">
@@ -3393,7 +3395,7 @@
             AND a.operationDesc LIKE #{query.operationDesc}
         </if>
         <if test="query.operatorName != null and query.operatorName != ''">
-            AND a.OperatorName LIKE #{query.operatorName}
+            AND u.UserName LIKE #{query.operatorName}
         </if>
         <if test="query.startDate != null">
             AND a.ScheduledDate >= #{query.startDate}