Merge remote-tracking branch 'origin/master'

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java

@@ -73,7 +73,6 @@ public class WorkOrderController extends BladeController {
 
 	private final IWorkOrderService workOrderService;
 
-	private final StringRedisTemplate stringRedisTemplate;
 
 	/**
 	 * 车间订单表 详情

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -206,7 +206,7 @@
         LEFT JOIN BS_TEAM_SET g on c.MAKE_TEAM = g.ID
         LEFT JOIN MES_WORK_PLAN h on h.wo_id = a.id
         <where>
-            a.is_deleted = 0
+            a.is_deleted = 0 and h.is_deleted = 0
             <if test="startTime !=null and startTime != ''">
                 and (to_char(h.start_time,'YYYY-MM-DD') = #{startTime} or (h.start_time <![CDATA[ < ]]> to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and   h.end_time <![CDATA[ > ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
             </if>