66

src/main/resources/mapper/board/BoardMapper.xml

@@ -66,7 +66,8 @@
     from  WorkCenter R
     LEFT JOIN SOScheduledRouting SR on SR.Site=R.Site and SR.S_WorkCenterNo=R.WorkCenterNo
       left join ProductionLine PL on PL.site =R.site and PL.ProLineNo=R.ProLineNo
-    and S_ScheduledDate=#{date}
+
+     where  S_ScheduledDate=#{date} and R.workcenterNo like 'P%'
     GROUP BY PL.ProLineNo,PL.ProLineDesc,R.Site
  ORDER BY PL.ProLineNo
 </select>
@@ -92,7 +93,8 @@
     from WorkCenter R
     LEFT JOIN SOScheduledRouting SR on SR.Site=R.Site and SR.S_WorkCenterNo=R.WorkCenterNo
     left join ProductionLine PL on PL.site =R.site and PL.ProLineNo=R.ProLineNo
-        and SR.S_ScheduledDate=#{date}
+
+    where  SR.S_ScheduledDate=#{date}  and R.workcenterNo like 'P%'
     GROUP BY PL.ProLineNo,PL.ProLineDesc
     ORDER BY PL.ProLineNo
 

src/main/resources/mapper/pda/ToolDetailMapper.xml

@@ -698,7 +698,7 @@
         LEFT JOIN Location as l ON td.LocationID = l.LocationID and td.Site = l.Site
         <where>
             td.Site = #{query.site}
-            and dbo.Get_AttributeValue(td.Site, td.ToolID, 'CUSTOMER') is not null
+
             <if test="query.toolId != '' and query.toolId != null">
                 AND td.ToolID like #{query.toolId}
             </if>