在手任务过滤条件

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderDetailSelectDto.java

@@ -74,4 +74,9 @@ public class ProduceOrderDetailSelectDto extends BaseSelectDto {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date schedulingDate;
 
+    /**
+     * 是否在手
+     */
+    private Integer isHand;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -73,12 +73,16 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     public Page<ProductionOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto) {
         IWrapper<ProductionOrderDetail> wrapper = getPageCommWrapper(dto);
 
+        //在手过滤 未开始 / 生产中的数据
+        if (ObjectUtil.isNotEmpty(dto.getIsHand())) {
+            wrapper.in("pod.produce_status", 0, 1);
+        }
+
         //是否排程过滤
         if (ObjectUtil.isNotEmpty(dto.getIsScheduling())) {
             wrapper.having("if(count( ps.id )>0,1,0)={0}", dto.getIsScheduling());
         }
 
-
         wrapper.groupBy("pod.id");
 
         Page<ProductionOrderDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -364,14 +368,14 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
     @Override
     public JSONObject taskCount(ProduceOrderDetailSelectDto dto) {
-        dto.setIsScheduling(null);
+        dto.setIsHand(null);
 
         //完成任务查询
         ProduceOrderDetailSelectDto completedCountDto = BeanUtil.copyProperties(dto, ProduceOrderDetailSelectDto.class);
         completedCountDto.setProduceStatus("2,5,10");
         //在手任务查询
         ProduceOrderDetailSelectDto onHandCountDto = BeanUtil.copyProperties(dto, ProduceOrderDetailSelectDto.class);
-        onHandCountDto.setIsScheduling(0);
+        onHandCountDto.setIsHand(1);
 
         //单个工序查询
         String dayDate = DateUtil.format(dto.getSchedulingDate(), "yyyy-MM-dd");